diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 253353b..db440e4 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -81,17 +81,22 @@
 list (APPEND grgsm_link_libraries ${Boost_LIBRARIES})
 list (APPEND grgsm_link_libraries ${GNURADIO_ALL_LIBRARIES})
 list (APPEND grgsm_link_libraries ${VOLK_LIBRARIES})
-list (APPEND grgsm_link_libraries ${Boost_LIBRARIES})
 if(WIN32)
-	list (APPEND grgsm_link_libraries wsock32)
-	list (APPEND grgsm_link_libraries ws2_32)
+    list (APPEND grgsm_link_libraries wsock32)
+    list (APPEND grgsm_link_libraries ws2_32)
+endif()
+
+if(LIBOSMOCORE_FOUND AND LIBOSMOCODEC_FOUND)
+    list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARIES} ${LIBOSMOCODEC_LIBRARIES})
+    if(LIBOSMOCODING_FOUND)
+        list (APPEND grgsm_link_libraries ${LIBOSMOCODING_LIBRARIES})
+    endif()
 endif()
 
 
+
 add_library(grgsm SHARED ${grgsm_sources})
-target_link_libraries(grgsm ${grgsm_link_libraries} #${LIBOSMOCORE_LIBRARIES}
-# ${LIBOSMOCODEC_LIBRARIES}
-# ${LIBOSMOCODING_LIBRARIES} 
+target_link_libraries(grgsm ${grgsm_link_libraries}
 # libraries required by plotting.h - have troubles to be installed by pybombs
 #    boost_iostreams
 #    boost_system
diff --git a/lib/decoding/CMakeLists.txt b/lib/decoding/CMakeLists.txt
index cbf2a8e..bb5ddde 100644
--- a/lib/decoding/CMakeLists.txt
+++ b/lib/decoding/CMakeLists.txt
@@ -17,11 +17,16 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-add_subdirectory(osmocom/coding)
-add_subdirectory(osmocom/core)
-add_subdirectory(osmocom/codec)
-add_subdirectory(osmocom/gsm)
-add_subdirectory(osmocom/crypt)
+if(NOT LIBOSMOCORE_FOUND OR NOT LIBOSMOCODEC_FOUND)
+    message(STATUS "Libosmocore installation not found - compiling local version")
+    add_subdirectory(osmocom/core)
+    add_subdirectory(osmocom/codec)
+    add_subdirectory(osmocom/gsm)
+elseif(NOT LIBOSMOCODING_FOUND)
+    message(STATUS "Libosmocore found but libosmocoding is missing - compiling local version")
+    add_subdirectory(osmocom/coding)
+endif()
+
 add_subdirectory(openbts)
 
 add_sources(