diff --git a/cmake/modules/FindUHD.cmake b/cmake/modules/FindUHD.cmake
index 52e37d3fb..fc178030d 100644
--- a/cmake/modules/FindUHD.cmake
+++ b/cmake/modules/FindUHD.cmake
@@ -1,5 +1,5 @@
 INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(UHD uhd)
+#PKG_CHECK_MODULES(UHD uhd)
 IF(NOT UHD_FOUND)
 
 FIND_PATH(
@@ -20,7 +20,11 @@ FIND_LIBRARY(
           /usr/local/lib32
 )
 
+message(STATUS "UHD LIBRARIES " ${UHD_LIBRARIES})
+message(STATUS "UHD INCLUDE DIRS " ${UHD_INCLUDE_DIRS})
+
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(UHD DEFAULT_MSG UHD_LIBRARIES UHD_INCLUDE_DIRS)
+MARK_AS_ADVANCED(UHD_LIBRARIES UHD_INCLUDE_DIRS)
 
 ENDIF(NOT UHD_FOUND)
diff --git a/srslte/CMakeLists.txt b/srslte/CMakeLists.txt
index a9121a5b8..0f2940a0b 100644
--- a/srslte/CMakeLists.txt
+++ b/srslte/CMakeLists.txt
@@ -41,6 +41,11 @@ FOREACH (_header ${headers})
 ENDFOREACH()
 ADD_CUSTOM_TARGET (add_srslte_headers SOURCES ${HEADERS_ALL})
 
+########################################################################
+# Find Dependencies
+########################################################################
+FIND_PACKAGE(UHD)
+
 ########################################################################
 # Add subdirectories
 ########################################################################
diff --git a/srslte/lib/CMakeLists.txt b/srslte/lib/CMakeLists.txt
index e0badee67..af333c2f6 100644
--- a/srslte/lib/CMakeLists.txt
+++ b/srslte/lib/CMakeLists.txt
@@ -26,7 +26,6 @@
 include(CheckFunctionExistsMath)
 
 FIND_PACKAGE(SRSGUI)
-FIND_PACKAGE(UHD)
 FIND_PACKAGE(FFTW3F REQUIRED) # TODO: distribute kissfft instead
 
 IF(${DISABLE_VOLK})