diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1ffe5e4f..db8215811 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -535,7 +535,7 @@ if (BUILD_DEBIAN)
     add_subdirectory(libhackrf)
     add_subdirectory(librtlsdr)
     add_subdirectory(libbladerf)
-    add_subdirectory(libsdrplay)
+    add_subdirectory(libmirisdr)
 endif (BUILD_DEBIAN)
 
 add_subdirectory(plugins)
diff --git a/debian/rules b/debian/rules
index 0c3bb9a7f..921507832 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,5 +21,5 @@
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DBUILD_TYPE=DEBIAN -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DBUILD_TYPE=DEBIAN -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -DLIBBLADERFSRC=/z1/softs/bladeRF -DLIBBLADERFCOMMONSRC=/z1/softs/bladeRF/host/common -DLIBBLADERFLIBSRC=/z1/softs/bladeRF/host/libraries/libbladeRF -DLIBMIRISDRSRC=/z1/development/libmirisdr-4
 
diff --git a/libmirisdr/CMakeLists.txt b/libmirisdr/CMakeLists.txt
new file mode 100644
index 000000000..c094f4fe0
--- /dev/null
+++ b/libmirisdr/CMakeLists.txt
@@ -0,0 +1,55 @@
+project(mirisdr)
+
+find_package(LibUSB)
+
+set(mirisdr_SOURCES
+    ${LIBMIRISDRSRC}/src/libmirisdr.c 
+    ${LIBMIRISDRSRC}/src/getopt/getopt.c 
+)
+
+set(mirisdr_HEADERS
+    ${LIBMIRISDRSRC}/include/mirisdr.h
+    ${LIBMIRISDRSRC}/include/mirisdr_export.h
+    ${LIBMIRISDRSRC}/src/getopt/getopt.h
+    ${LIBMIRISDRSRC}/src/convert/252_s16.c
+    ${LIBMIRISDRSRC}/src/convert/336_s16.c
+    ${LIBMIRISDRSRC}/src/convert/384_s16.c
+    ${LIBMIRISDRSRC}/src/convert/504_s16.c
+    ${LIBMIRISDRSRC}/src/convert/504_s8.c
+    ${LIBMIRISDRSRC}/src/convert/base.c
+    ${LIBMIRISDRSRC}/src/adc.c
+    ${LIBMIRISDRSRC}/src/async.c
+    ${LIBMIRISDRSRC}/src/constants.h
+    ${LIBMIRISDRSRC}/src/convenience.c
+    ${LIBMIRISDRSRC}/src/devices.c
+    ${LIBMIRISDRSRC}/src/gain.c
+    ${LIBMIRISDRSRC}/src/gain.h
+    ${LIBMIRISDRSRC}/src/hard.c
+    ${LIBMIRISDRSRC}/src/hard.h
+    ${LIBMIRISDRSRC}/src/reg.c
+    ${LIBMIRISDRSRC}/src/soft.c
+    ${LIBMIRISDRSRC}/src/soft.h
+    ${LIBMIRISDRSRC}/src/streaming.c
+    ${LIBMIRISDRSRC}/src/structs.h
+    ${LIBMIRISDRSRC}/src/sync.c
+)
+
+include_directories(
+    .
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LIBUSB_INCLUDE_DIR}
+    ${LIBMIRISDRSRC}/include
+    ${LIBMIRISDRSRC}/src
+)
+
+add_definitions(-DQT_SHARED)
+
+add_library(mirisdr SHARED
+    ${mirisdr_SOURCES}
+)
+
+target_link_libraries(mirisdr
+    ${LIBUSB_LIBRARIES}
+)
+
+install(TARGETS mirisdr DESTINATION lib)
diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt
index ff162b746..42aa7b262 100644
--- a/plugins/samplesource/CMakeLists.txt
+++ b/plugins/samplesource/CMakeLists.txt
@@ -67,6 +67,7 @@ if (BUILD_DEBIAN)
     add_subdirectory(hackrf)
     add_subdirectory(rtlsdr)
     add_subdirectory(bladerf)
+    add_subdirectory(sdrplay)
 endif (BUILD_DEBIAN)
 
 add_subdirectory(filesource)
diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt
index 7e127242d..22c833d0d 100644
--- a/plugins/samplesource/rtlsdr/CMakeLists.txt
+++ b/plugins/samplesource/rtlsdr/CMakeLists.txt
@@ -31,7 +31,7 @@ else (BUILD_DEBIAN)
 include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBRTLSDR_INCLUDE_DIR}
+    ${LIBRTLSDRSRC}/include
 )
 endif (BUILD_DEBIAN)
 
diff --git a/plugins/samplesource/sdrplay/CMakeLists.txt b/plugins/samplesource/sdrplay/CMakeLists.txt
index 9f82242c4..6e0a81dd3 100644
--- a/plugins/samplesource/sdrplay/CMakeLists.txt
+++ b/plugins/samplesource/sdrplay/CMakeLists.txt
@@ -24,7 +24,8 @@ if (BUILD_DEBIAN)
 include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${LIBMIRISDR_INCLUDE_DIR}
+    ${LIBMIRISDRSRC}/include
+    ${LIBMIRISDRSRC}/src
 )
 else (BUILD_DEBIAN)
 include_directories(