diff --git a/lib/uhd/CMakeLists.txt b/lib/uhd/CMakeLists.txt
new file mode 100644
index 0000000..ab6d24b
--- /dev/null
+++ b/lib/uhd/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Copyright 2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+# This file included, use CMake directory variables
+########################################################################
+
+include_directories(APPEND ${CMAKE_CURRENT_SOURCE_DIR})
+
+set(uhd_srcs
+    ${CMAKE_CURRENT_SOURCE_DIR}/uhd_source_c.cc
+)
+
+########################################################################
+# Append gnuradio-osmosdr library sources
+########################################################################
+list(APPEND gr_osmosdr_srcs ${uhd_srcs})
+list(APPEND gr_osmosdr_libs ${GNURADIO_UHD_LIBRARIES})
+
diff --git a/lib/uhd/uhd_source_c.cc b/lib/uhd/uhd_source_c.cc
new file mode 100644
index 0000000..3bede37
--- /dev/null
+++ b/lib/uhd/uhd_source_c.cc
@@ -0,0 +1,202 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Dimitri Stolnikov <horiz0n@gmx.net>
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <boost/foreach.hpp>
+#include <boost/assign.hpp>
+
+//#include <uhd/property_tree.hpp>
+
+#include <gr_io_signature.h>
+
+#include "uhd_source_c.h"
+
+using namespace boost::assign;
+
+uhd_source_c_sptr make_uhd_source_c(const std::string &args)
+{
+    return gnuradio::get_initial_sptr(new uhd_source_c(args));
+}
+
+uhd_source_c::uhd_source_c(const std::string &args) :
+    gr_hier_block2("uhd_source_c",
+                   gr_make_io_signature (0, 0, 0),
+                   gr_make_io_signature (1, 1, sizeof (gr_complex)))
+{
+    _src = uhd_make_usrp_source( args, uhd::io_type_t::COMPLEX_FLOAT32, 1 );
+
+    connect( _src, 0, self(), 0 );
+}
+
+uhd_source_c::~uhd_source_c()
+{
+}
+
+std::vector< std::string > uhd_source_c::get_devices()
+{
+    std::vector< std::string > devices;
+
+    uhd::device_addr_t hint;
+    BOOST_FOREACH(uhd::device_addr_t device, uhd::device::find(hint))
+        devices += device.to_string();
+
+    return devices;
+}
+
+gr_basic_block_sptr uhd_source_c::self()
+{
+    return gr_hier_block2::self();
+}
+
+std::string uhd_source_c::name()
+{
+//  uhd::property_tree::sptr prop_tree = _src->get_device()->get_device()->get_tree();
+//  std::string dev_name = prop_tree->access<std::string>("/name").get();
+  std::string mboard_name = _src->get_device()->get_mboard_name();
+
+//  std::cout << "'" << dev_name << "' '" << mboard_name << "'" << std::endl;
+//  'USRP1 Device' 'USRP1 (Classic)'
+//  'B-Series Device' 'B100 (B-Hundo)'
+
+  return mboard_name;
+}
+
+size_t uhd_source_c::get_num_channels()
+{
+  return _src->get_device()->get_rx_num_channels();
+}
+
+osmosdr::meta_range_t uhd_source_c::get_sample_rates( void )
+{
+  osmosdr::meta_range_t rates;
+
+  BOOST_FOREACH( uhd::range_t rate, _src->get_samp_rates() )
+      rates += osmosdr::range_t( rate.start(), rate.stop(), rate.step() );
+
+  return rates;
+}
+
+double uhd_source_c::set_sample_rate( double rate )
+{
+  _src->set_samp_rate( rate );
+  return get_sample_rate();
+}
+
+double uhd_source_c::get_sample_rate( void )
+{
+  return _src->get_samp_rate();
+}
+
+osmosdr::freq_range_t uhd_source_c::get_freq_range( size_t chan )
+{
+  osmosdr::freq_range_t range;
+
+  BOOST_FOREACH( uhd::range_t freq, _src->get_freq_range(chan) )
+      range += osmosdr::range_t( freq.start(), freq.stop(), freq.step() );
+
+  return range;
+}
+
+double uhd_source_c::set_center_freq( double freq, size_t chan )
+{
+  _src->set_center_freq(freq, chan);
+
+  return get_center_freq(chan);
+}
+
+double uhd_source_c::get_center_freq( size_t chan )
+{
+  return _src->get_center_freq(chan);
+}
+
+double uhd_source_c::set_freq_corr( double ppm, size_t chan )
+{
+  return get_freq_corr(chan);
+}
+
+double uhd_source_c::get_freq_corr( size_t chan )
+{
+  throw std::runtime_error( "frequency correction is not supported with UHD" );
+}
+
+std::vector<std::string> uhd_source_c::get_gain_names( size_t chan )
+{
+  return _src->get_gain_names( chan );
+}
+
+osmosdr::gain_range_t uhd_source_c::get_gain_range( size_t chan )
+{
+  osmosdr::gain_range_t range;
+
+  BOOST_FOREACH( uhd::range_t gain, _src->get_gain_range(chan) )
+      range += osmosdr::range_t( gain.start(), gain.stop(), gain.step() );
+
+  return range;
+}
+
+osmosdr::gain_range_t uhd_source_c::get_gain_range( const std::string & name, size_t chan )
+{
+  osmosdr::gain_range_t range;
+
+  BOOST_FOREACH( uhd::range_t gain, _src->get_gain_range(name, chan) )
+      range += osmosdr::range_t( gain.start(), gain.stop(), gain.step() );
+
+  return range;
+}
+
+double uhd_source_c::set_gain( double gain, size_t chan )
+{
+  _src->set_gain(gain, chan);
+
+  return get_gain(chan);
+}
+
+double uhd_source_c::set_gain( double gain, const std::string & name, size_t chan )
+{
+  _src->set_gain(gain, name, chan);
+
+  return get_gain(name, chan);
+}
+
+double uhd_source_c::get_gain( size_t chan )
+{
+  return _src->get_gain(chan);
+}
+
+double uhd_source_c::get_gain( const std::string & name, size_t chan )
+{
+  return _src->get_gain(name, chan);
+}
+
+std::vector< std::string > uhd_source_c::get_antennas( size_t chan )
+{
+  return _src->get_antennas(chan);
+}
+
+std::string uhd_source_c::set_antenna( const std::string & antenna, size_t chan )
+{
+  _src->set_antenna(antenna, chan);
+
+  return _src->get_antenna(chan);
+}
+
+std::string uhd_source_c::get_antenna( size_t chan )
+{
+  return _src->get_antenna(chan);
+}
diff --git a/lib/uhd/uhd_source_c.h b/lib/uhd/uhd_source_c.h
new file mode 100644
index 0000000..bc398bf
--- /dev/null
+++ b/lib/uhd/uhd_source_c.h
@@ -0,0 +1,80 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Dimitri Stolnikov <horiz0n@gmx.net>
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef UHD_SOURCE_C_H
+#define UHD_SOURCE_C_H
+
+#include <gr_hier_block2.h>
+
+#include <gr_uhd_usrp_source.h>
+
+#include "osmosdr_src_iface.h"
+
+class uhd_source_c;
+
+typedef boost::shared_ptr< uhd_source_c > uhd_source_c_sptr;
+
+uhd_source_c_sptr make_uhd_source_c(const std::string &args = "");
+
+class uhd_source_c : public gr_hier_block2,
+                     public osmosdr_src_iface
+{
+private:
+  friend uhd_source_c_sptr make_uhd_source_c(const std::string &args);
+
+  uhd_source_c(const std::string &args);
+
+public:
+  ~uhd_source_c();
+
+  static std::vector< std::string > get_devices();
+
+  gr_basic_block_sptr self();
+
+  std::string name();
+
+  size_t get_num_channels( void );
+
+  osmosdr::meta_range_t get_sample_rates( void );
+  double set_sample_rate( double rate );
+  double get_sample_rate( void );
+
+  osmosdr::freq_range_t get_freq_range( size_t chan = 0 );
+  double set_center_freq( double freq, size_t chan = 0 );
+  double get_center_freq( size_t chan = 0 );
+  double set_freq_corr( double ppm, size_t chan = 0 );
+  double get_freq_corr( size_t chan = 0 );
+
+  std::vector<std::string> get_gain_names( size_t chan = 0 );
+  osmosdr::gain_range_t get_gain_range( size_t chan = 0 );
+  osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );
+  double set_gain( double gain, size_t chan = 0 );
+  double set_gain( double gain, const std::string & name, size_t chan = 0 );
+  double get_gain( size_t chan = 0 );
+  double get_gain( const std::string & name, size_t chan = 0 );
+
+  std::vector< std::string > get_antennas( size_t chan = 0 );
+  std::string set_antenna( const std::string & antenna, size_t chan = 0 );
+  std::string get_antenna( size_t chan = 0 );
+
+private:
+  boost::shared_ptr<uhd_usrp_source> _src;
+};
+
+#endif // UHD_SOURCE_C_H