--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@
 
 # Find GNURadio (pmt and runtime are core, always included)
 include(FindPkgConfig)
-find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks fft filter)
+find_package(Gnuradio "3.9" REQUIRED COMPONENTS audio blocks fft filter)
 
 # Set the version information here
 set(VERSION_MAJOR 0)
@@ -165,6 +165,11 @@
 find_package(gnuradio-uhd PATHS ${Gnuradio_DIR})
 message (STATUS " Found UHD Block: ${gnuradio-uhd_FOUND}")
 
+message(STATUS "Searching for Funcube Block...")
+find_package(funcube CONFIG CONFIGS gnuradio-funcubeConfig.cmake)
+message (STATUS " Found Funcube Block: ${funcube_FOUND}")
+message (STATUS " Found Funcube DIR: ${funcube_DIR}")
+
 message(STATUS "Searching for Volk...")
 find_package(Volk REQUIRED)
 message (STATUS " Found Volk: ${Volk_FOUND}")
@@ -180,7 +185,6 @@
 find_package(LibAIRSPY)
 find_package(LibAIRSPYHF)
 find_package(LibbladeRF)
-find_package(GnuradioFCDPP)
 find_package(SoapySDR NO_MODULE)
 find_package(LibFreeSRP)
 find_package(LibXTRX)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -138,7 +138,7 @@
 ########################################################################
 # Setup FCD component
 ########################################################################
-GR_REGISTER_COMPONENT("FUNcube Dongle" ENABLE_FCD GNURADIO_FCDPP_FOUND)
+GR_REGISTER_COMPONENT("FUNcube Dongle" ENABLE_FCD funcube_FOUND)
 if(ENABLE_FCD)
     add_subdirectory(fcd)
 endif(ENABLE_FCD)
--- a/lib/fcd/CMakeLists.txt
+++ b/lib/fcd/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2012 Free Software Foundation, Inc.
+# Copyright 2012,2021 Free Software Foundation, Inc.
 #
 # This file is part of gr-osmosdr
 #
@@ -23,11 +23,10 @@
 
 target_include_directories(gnuradio-osmosdr PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GNURADIO_FCDPP_INCLUDE_DIRS}
 )
 
 APPEND_LIB_LIST(
-    ${GNURADIO_FCDPP_LIBRARIES}
+    gnuradio::gnuradio-funcube
 )
 
 list(APPEND gr_osmosdr_srcs
--- a/lib/fcd/fcd_source_c.h
+++ b/lib/fcd/fcd_source_c.h
@@ -22,8 +22,8 @@
 
 #include <gnuradio/hier_block2.h>
 
-#include <fcdproplus/fcd.h>
-#include <fcdproplus/fcdproplus.h>
+#include <funcube/fcd.h>
+#include <funcube/fcdpp.h>
 
 #include "source_iface.h"
 
@@ -81,8 +81,8 @@
 
 private:
   dongle_type _type;
-  gr::fcdproplus::fcd::sptr _src_v1;
-  gr::fcdproplus::fcdproplus::sptr _src_v2;
+  gr::funcube::fcd::sptr _src_v1;
+  gr::funcube::fcdpp::sptr _src_v2;
   double _lna_gain, _mix_gain, _bb_gain, _freq;
   int _correct;
 };
--- a/lib/fcd/fcd_source_c.cc
+++ b/lib/fcd/fcd_source_c.cc
@@ -143,7 +143,7 @@
 
   if ( FUNCUBE_V1 == _type )
   {
-    _src_v1 = gr::fcdproplus::fcd::make( dev_name );
+    _src_v1 = gr::funcube::fcd::make( dev_name );
     connect( _src_v1, 0, self(), 0 );
 
     set_gain( 20, "LNA" );
@@ -152,7 +152,7 @@
 
   if ( FUNCUBE_V2 == _type )
   {
-    _src_v2 = gr::fcdproplus::fcdproplus::make( dev_name );
+    _src_v2 = gr::funcube::fcdpp::make( dev_name );
     connect( _src_v2, 0, self(), 0 );
 
     set_gain( 1, "LNA" );
