diff --git a/pluginssrv/channelrx/CMakeLists.txt b/pluginssrv/channelrx/CMakeLists.txt
index e9c671b2f..0b52629b2 100644
--- a/pluginssrv/channelrx/CMakeLists.txt
+++ b/pluginssrv/channelrx/CMakeLists.txt
@@ -12,6 +12,11 @@ if(CM256CC_FOUND)
     add_subdirectory(remotesink)
 endif(CM256CC_FOUND)
 
+find_package(Codec2)
+if (CODEC2_FOUND)
+    add_subdirectory(demodfreedv)
+endif(CODEC2_FOUND)
+
 add_subdirectory(demodnfm)
 add_subdirectory(demodssb)
 add_subdirectory(demodwfm)
diff --git a/pluginssrv/channelrx/demodfreedv/CMakeLists.txt b/pluginssrv/channelrx/demodfreedv/CMakeLists.txt
new file mode 100644
index 000000000..02d6ddd34
--- /dev/null
+++ b/pluginssrv/channelrx/demodfreedv/CMakeLists.txt
@@ -0,0 +1,45 @@
+project(demodfreedv)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channelrx/demodfreedv")
+
+set(freedv_SOURCES
+	${PLUGIN_PREFIX}/freedvdemod.cpp
+	${PLUGIN_PREFIX}/freedvdemodsettings.cpp
+	${PLUGIN_PREFIX}/freedvplugin.cpp
+)
+
+set(freedv_HEADERS
+	${PLUGIN_PREFIX}/freedvdemod.h
+	${PLUGIN_PREFIX}/freedvdemodsettings.h
+	${PLUGIN_PREFIX}/freedvplugin.h
+)
+
+include_directories(
+	.
+	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${CMAKE_SOURCE_DIR}/libfreedv
+    ${CODEC2_INCLUDE_DIR}
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(demodfreedvsrv SHARED
+	${freedv_SOURCES}
+	${freedv_HEADERS_MOC}
+)
+
+target_link_libraries(demodfreedvsrv
+	${QT_LIBRARIES}
+	sdrbase
+	swagger
+	freedv
+	${CODEC2_LIBRARIES}
+)
+
+target_link_libraries(demodfreedvsrv Qt5::Core)
+
+install(TARGETS demodfreedvsrv DESTINATION lib/pluginssrv/channelrx)
diff --git a/pluginssrv/channeltx/CMakeLists.txt b/pluginssrv/channeltx/CMakeLists.txt
index 6b229281c..f5600f0fe 100644
--- a/pluginssrv/channeltx/CMakeLists.txt
+++ b/pluginssrv/channeltx/CMakeLists.txt
@@ -15,3 +15,8 @@ find_package(OpenCV)
 if (OpenCV_FOUND)
 	add_subdirectory(modatv)
 endif()
+
+find_package(Codec2)
+if (CODEC2_FOUND)
+    add_subdirectory(modfreedv)
+endif(CODEC2_FOUND)
\ No newline at end of file
diff --git a/pluginssrv/channeltx/modfreedv/CMakeLists.txt b/pluginssrv/channeltx/modfreedv/CMakeLists.txt
new file mode 100644
index 000000000..73e827d30
--- /dev/null
+++ b/pluginssrv/channeltx/modfreedv/CMakeLists.txt
@@ -0,0 +1,45 @@
+project(modfreedv)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channeltx/modfreedv")
+
+set(modfreedv_SOURCES
+    ${PLUGIN_PREFIX}/freedvmod.cpp
+    ${PLUGIN_PREFIX}/freedvmodplugin.cpp
+    ${PLUGIN_PREFIX}/freedvmodsettings.cpp
+)
+
+set(modfreedv_HEADERS
+    ${PLUGIN_PREFIX}/freedvmod.h
+    ${PLUGIN_PREFIX}/freedvmodplugin.h
+    ${PLUGIN_PREFIX}/freedvmodsettings.h
+)
+
+include_directories(
+    .
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+    ${CMAKE_SOURCE_DIR}/libfreedv
+    ${CODEC2_INCLUDE_DIR}
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(modfreedvsrv SHARED
+    ${modfreedv_SOURCES}
+    ${modfreedv_HEADERS_MOC}
+)
+
+target_link_libraries(modfreedvsrv
+    ${QT_LIBRARIES}
+    sdrbase
+    swagger
+	freedv
+    ${CODEC2_LIBRARIES}
+)
+
+target_link_libraries(modfreedvsrv Qt5::Core)
+
+install(TARGETS modfreedvsrv DESTINATION lib/pluginssrv/channeltx)