diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt
index e1f4de43f..275128774 100644
--- a/plugins/channelrx/localsink/CMakeLists.txt
+++ b/plugins/channelrx/localsink/CMakeLists.txt
@@ -35,35 +35,18 @@ add_library(localsink SHARED
 	${localsink_FORMS_HEADERS}
 )
 
-if (BUILD_DEBIAN)
 target_include_directories(localsink PUBLIC
     .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
 )
-else (BUILD_DEBIAN)
-target_include_directories(localsink PUBLIC
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-)
-endif (BUILD_DEBIAN)
 
-if (BUILD_DEBIAN)
 target_link_libraries(localsink
     ${QT_LIBRARIES}
     sdrbase
     sdrgui
     swagger
 )
-else (BUILD_DEBIAN)
-target_link_libraries(localsink
-    ${QT_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-)
-endif (BUILD_DEBIAN)
 
 target_link_libraries(localsink Qt5::Core Qt5::Widgets)
 
diff --git a/plugins/samplesource/localinput/CMakeLists.txt b/plugins/samplesource/localinput/CMakeLists.txt
index f7f8e65d8..8afebed99 100644
--- a/plugins/samplesource/localinput/CMakeLists.txt
+++ b/plugins/samplesource/localinput/CMakeLists.txt
@@ -20,7 +20,6 @@ set(localinput_FORMS
     localinputgui.ui
 )
 
-#include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
@@ -33,39 +32,18 @@ add_library(inputlocal SHARED
     ${localinput_FORMS_HEADERS}
 )
 
-if (BUILD_DEBIAN)
 target_include_directories(inputlocal PUBLIC
     .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${LIBCM256CCSRC}/..
 )
-else (BUILD_DEBIAN)
-target_include_directories(inputlocal PUBLIC
-    .
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CM256CC_INCLUDE_DIR}
-)
-endif (BUILD_DEBIAN)
 
-if (BUILD_DEBIAN)
 target_link_libraries(inputlocal
     ${QT_LIBRARIES}
-    cm256cc
     sdrbase
     sdrgui
     swagger
 )
-else (BUILD_DEBIAN)
-target_link_libraries(inputlocal
-    ${QT_LIBRARIES}
-    ${CM256CC_LIBRARIES}
-    sdrbase
-    sdrgui
-    swagger
-)
-endif (BUILD_DEBIAN)
 
 target_link_libraries(inputlocal Qt5::Core Qt5::Widgets)
 
diff --git a/pluginssrv/channelrx/CMakeLists.txt b/pluginssrv/channelrx/CMakeLists.txt
index 0b52629b2..0f188464a 100644
--- a/pluginssrv/channelrx/CMakeLists.txt
+++ b/pluginssrv/channelrx/CMakeLists.txt
@@ -21,3 +21,4 @@ add_subdirectory(demodnfm)
 add_subdirectory(demodssb)
 add_subdirectory(demodwfm)
 add_subdirectory(udpsink)
+add_subdirectory(localsink)
diff --git a/pluginssrv/channelrx/localsink/CMakeLists.txt b/pluginssrv/channelrx/localsink/CMakeLists.txt
new file mode 100644
index 000000000..ef20f7c14
--- /dev/null
+++ b/pluginssrv/channelrx/localsink/CMakeLists.txt
@@ -0,0 +1,43 @@
+project(localsink)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channelrx/localsink")
+
+set(localsink_SOURCES
+    ${PLUGIN_PREFIX}/localsink.cpp
+	${PLUGIN_PREFIX}/localsinksettings.cpp
+	${PLUGIN_PREFIX}/localsinkthread.cpp
+	${PLUGIN_PREFIX}/localsinkplugin.cpp
+)
+
+set(localsink_HEADERS
+    ${PLUGIN_PREFIX}/localsink.h
+	${PLUGIN_PREFIX}/localsinksettings.h
+	${PLUGIN_PREFIX}/localsinkthread.h
+	${PLUGIN_PREFIX}/localsinkplugin.h
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(localsinksrv SHARED
+	${localsink_SOURCES}
+	${localsink_HEADERS_MOC}
+)
+
+target_include_directories(localsinksrv PUBLIC
+    .
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+)
+
+target_link_libraries(localsinksrv
+    ${QT_LIBRARIES}
+    sdrbase
+    swagger
+)
+
+target_link_libraries(localsinksrv Qt5::Core)
+
+install(TARGETS localsinksrv DESTINATION lib/pluginssrv/channelrx)
diff --git a/pluginssrv/samplesource/CMakeLists.txt b/pluginssrv/samplesource/CMakeLists.txt
index 690f487c9..1e3e028a5 100644
--- a/pluginssrv/samplesource/CMakeLists.txt
+++ b/pluginssrv/samplesource/CMakeLists.txt
@@ -106,3 +106,4 @@ endif (BUILD_DEBIAN)
 
 add_subdirectory(filesource)
 add_subdirectory(testsource)
+add_subdirectory(localinput)
\ No newline at end of file
diff --git a/pluginssrv/samplesource/localinput/CMakeLists.txt b/pluginssrv/samplesource/localinput/CMakeLists.txt
new file mode 100644
index 000000000..bd1cfed3b
--- /dev/null
+++ b/pluginssrv/samplesource/localinput/CMakeLists.txt
@@ -0,0 +1,41 @@
+project(localinput)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/samplesource/localinput")
+
+set(localinput_SOURCES
+    ${PLUGIN_PREFIX}/localinput.cpp
+    ${PLUGIN_PREFIX}/localinputsettings.cpp
+    ${PLUGIN_PREFIX}/localinputplugin.cpp
+)
+
+set(localinput_HEADERS
+    ${PLUGIN_PREFIX}/localinput.h
+    ${PLUGIN_PREFIX}/localinputsettings.h
+    ${PLUGIN_PREFIX}/localinputplugin.h
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(inputlocalsrv SHARED
+    ${localinput_SOURCES}
+    ${localinput_HEADERS_MOC}
+)
+
+target_include_directories(inputlocalsrv PUBLIC
+    .
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+)
+
+target_link_libraries(inputlocalsrv
+    ${QT_LIBRARIES}
+    sdrbase
+    swagger
+)
+
+target_link_libraries(inputlocalsrv Qt5::Core)
+
+install(TARGETS inputlocalsrv DESTINATION lib/pluginssrv/samplesource)