diff --git a/devices/devices.pro b/devices/devices.pro
new file mode 100644
index 000000000..5956f100c
--- /dev/null
+++ b/devices/devices.pro
@@ -0,0 +1,34 @@
+#--------------------------------------------------------
+#
+# Pro file for Android and Windows builds with Qt Creator
+#
+#--------------------------------------------------------
+
+QT += core gui multimedia opengl
+
+TEMPLATE = lib
+TARGET = devices
+
+DEFINES += USE_SSE2=1
+QMAKE_CXXFLAGS += -msse2
+DEFINES += USE_SSE4_1=1
+QMAKE_CXXFLAGS += -msse4.1
+
+CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
+CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
+INCLUDEPATH += $$PWD
+INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += $$LIBBLADERFSRC
+
+CONFIG(Release):build_subdir = release
+CONFIG(Debug):build_subdir = debug
+
+SOURCES += bladerf/devicebladerf.cpp\
+        bladerf/devicebladerfvalues.cpp
+
+HEADERS  += bladerf/devicebladerf.h\
+        bladerf/devicebladerfparam.h\
+        bladerf/devicebladerfvalues.h
+
+LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
+LIBS += -L../libbladerf/$${build_subdir} -llibbladerf
diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.pro b/plugins/samplesink/bladerfoutput/bladerfoutput.pro
index 300b323ac..eb152df08 100644
--- a/plugins/samplesink/bladerfoutput/bladerfoutput.pro
+++ b/plugins/samplesink/bladerfoutput/bladerfoutput.pro
@@ -9,7 +9,7 @@ CONFIG += plugin
 
 QT += core gui widgets multimedia opengl
 
-TARGET = inputbladerf
+TARGET = outputbladerf
 
 DEFINES += USE_SSE2=1
 QMAKE_CXXFLAGS += -msse2
@@ -20,6 +20,7 @@ CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl
 CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../devices
 INCLUDEPATH += $$LIBBLADERFSRC
 
 CONFIG(Release):build_subdir = release
@@ -41,5 +42,6 @@ FORMS += bladerfoutputgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../libbladerf/$${build_subdir} -llibbladerf
+LIBS += -L../../../devices/$${build_subdir} -ldevices
 
 RESOURCES = ../../../sdrbase/resources/res.qrc
diff --git a/plugins/samplesource/bladerfinput/bladerfinput.pro b/plugins/samplesource/bladerfinput/bladerfinput.pro
index 39c1921b1..c965d0dd0 100644
--- a/plugins/samplesource/bladerfinput/bladerfinput.pro
+++ b/plugins/samplesource/bladerfinput/bladerfinput.pro
@@ -20,6 +20,7 @@ CONFIG(MINGW32):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\incl
 CONFIG(MINGW64):LIBBLADERFSRC = "D:\softs\bladeRF\host\libraries\libbladeRF\include"
 INCLUDEPATH += $$PWD
 INCLUDEPATH += ../../../sdrbase
+INCLUDEPATH += ../../../devices
 INCLUDEPATH += $$LIBBLADERFSRC
 
 CONFIG(Release):build_subdir = release
@@ -41,5 +42,6 @@ FORMS += bladerfinputgui.ui
 
 LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
 LIBS += -L../../../libbladerf/$${build_subdir} -llibbladerf
+LIBS += -L../../../devices/$${build_subdir} -ldevices
 
 RESOURCES = ../../../sdrbase/resources/res.qrc
diff --git a/sdrangel.windows.pro b/sdrangel.windows.pro
index 297bd806e..79a09ea66 100644
--- a/sdrangel.windows.pro
+++ b/sdrangel.windows.pro
@@ -6,6 +6,7 @@
 
 TEMPLATE = subdirs
 SUBDIRS = sdrbase
+SUBDIRS += devices
 SUBDIRS += lz4
 CONFIG(MINGW64)SUBDIRS += nanomsg
 SUBDIRS += fcdhid
@@ -26,6 +27,7 @@ SUBDIRS += plugins/samplesource/hackrfinput
 SUBDIRS += plugins/samplesource/airspy
 SUBDIRS += plugins/samplesource/bladerfinput
 SUBDIRS += plugins/samplesink/filesink
+SUBDIRS += plugins/samplesink/bladerfoutput
 SUBDIRS += plugins/channelrx/chanalyzer
 SUBDIRS += plugins/channelrx/demodam
 SUBDIRS += plugins/channelrx/demodbfm
diff --git a/windows.install.bat b/windows.install.bat
index 600fda403..d5f6076b3 100644
--- a/windows.install.bat
+++ b/windows.install.bat
@@ -2,6 +2,7 @@ SET libusbdir="D:\libusb-1.0.19\MinGW32"
 
 copy app\%1\sdrangel.exe %2
 copy sdrbase\%1\sdrbase.dll %2
+copy devices\%1\devices.dll %2
 copy lz4\%1\lz4.dll %2
 copy mbelib\%1\mbelib.dll %2
 copy dsdcc\%1\dsdcc.dll %2
@@ -36,3 +37,4 @@ copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
 copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource
 copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource
 copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink
+copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink
diff --git a/windows64.install.bat b/windows64.install.bat
index ef1bc55d5..a93e8c42e 100644
--- a/windows64.install.bat
+++ b/windows64.install.bat
@@ -14,6 +14,7 @@ copy %msys2dir%\mingw64\bin\zlib1.dll %2
 move %2\icudt56.dll %2\libicudt56.dll
 copy app\%1\sdrangel.exe %2
 copy sdrbase\%1\sdrbase.dll %2
+copy devices\%1\devices.dll %2
 copy cm256cc\%1\cm256cc.dll %2
 copy mbelib\%1\mbelib.dll %2
 copy dsdcc\%1\dsdcc.dll %2
@@ -51,3 +52,4 @@ copy plugins\samplesource\hackrfinput\%1\inputhackrf.dll %2\plugins\samplesource
 copy plugins\samplesource\airspy\%1\inputairspy.dll %2\plugins\samplesource
 copy plugins\samplesource\bladerfinput\%1\inputbladerf.dll %2\plugins\samplesource
 copy plugins\samplesink\filesink\%1\outputfilesink.dll %2\plugins\samplesink
+copy plugins\samplesink\bladerfoutput\%1\outputbladerf.dll %2\plugins\samplesink