diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 1a3afd0..504d0c6 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -128,10 +128,10 @@ endif(ENABLE_MIRI)
 # Setup configuration file
 ########################################################################
 ADD_DEFINITIONS(-DHAVE_CONFIG_H=1)
-include_directories(APPEND ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/gr_osmosdr_config.h
+    ${CMAKE_CURRENT_BINARY_DIR}/config.h
 @ONLY)
 
 ########################################################################
diff --git a/lib/miri/miri_source_c.cc b/lib/miri/miri_source_c.cc
index c928565..29e01ee 100644
--- a/lib/miri/miri_source_c.cc
+++ b/lib/miri/miri_source_c.cc
@@ -25,7 +25,7 @@
  * file included in your .cc file.
  */
 #ifdef HAVE_CONFIG_H
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 
 #include "miri_source_c.h"
diff --git a/lib/osmosdr/osmosdr_snk_c.cc b/lib/osmosdr/osmosdr_snk_c.cc
index 6792743..2dd3555 100644
--- a/lib/osmosdr/osmosdr_snk_c.cc
+++ b/lib/osmosdr/osmosdr_snk_c.cc
@@ -24,7 +24,7 @@
  * file included in your .cc file.
  */
 #ifdef HAVE_CONFIG_H
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 
 #include "osmosdr_snk_c.h"
diff --git a/lib/osmosdr/osmosdr_src_c.cc b/lib/osmosdr/osmosdr_src_c.cc
index b8c9141..f053589 100644
--- a/lib/osmosdr/osmosdr_src_c.cc
+++ b/lib/osmosdr/osmosdr_src_c.cc
@@ -24,7 +24,7 @@
  * file included in your .cc file.
  */
 #ifdef HAVE_CONFIG_H
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 
 #include "osmosdr_src_c.h"
diff --git a/lib/osmosdr_device.cc b/lib/osmosdr_device.cc
index 4ea0cac..3043645 100644
--- a/lib/osmosdr_device.cc
+++ b/lib/osmosdr_device.cc
@@ -27,7 +27,7 @@
 #include <sstream>
 
 #ifdef HAVE_CONFIG_H
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 /*
 #define ENABLE_OSMOSDR
diff --git a/lib/osmosdr_sink_c_impl.cc b/lib/osmosdr_sink_c_impl.cc
index 35fc49d..7e6a1ec 100644
--- a/lib/osmosdr_sink_c_impl.cc
+++ b/lib/osmosdr_sink_c_impl.cc
@@ -24,7 +24,7 @@
  * file included in your .cc file.
  */
 #ifdef HAVE_CONFIG_H
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 
 #include <osmosdr_sink_c_impl.h>
diff --git a/lib/osmosdr_source_c_impl.cc b/lib/osmosdr_source_c_impl.cc
index ed23576..708831c 100644
--- a/lib/osmosdr_source_c_impl.cc
+++ b/lib/osmosdr_source_c_impl.cc
@@ -24,8 +24,7 @@
  * file included in your .cc file.
  */
 #ifdef HAVE_CONFIG_H
-// FIXME: make it config.h again when they've fixed gnuradio master
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 
 #include <osmosdr_source_c_impl.h>
@@ -114,9 +113,9 @@ osmosdr_source_c_impl::osmosdr_source_c_impl (const std::string &args)
   dev_types.push_back("miri");
 #endif
 
-  std::cerr << "gr-osmosdr "
-            << "(" << GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER << ") "
-            << "supported device types:" << std::endl;
+  std::cerr << "gr-osmosdr ("
+            << GR_OSMOSDR_VERSION << " / " << GR_OSMOSDR_LIBVER
+            << ") supported device types:" << std::endl;
   std::cerr << "    " << std::flush;
   BOOST_FOREACH(std::string dev_type, dev_types)
     std::cerr << dev_type << " ";
diff --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc
index 7b380af..9f8e5a4 100644
--- a/lib/rtl/rtl_source_c.cc
+++ b/lib/rtl/rtl_source_c.cc
@@ -24,7 +24,7 @@
  * file included in your .cc file.
  */
 #ifdef HAVE_CONFIG_H
-#include "gr_osmosdr_config.h"
+#include "config.h"
 #endif
 
 #include "rtl_source_c.h"