diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2c651..1785448 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,16 @@ IF(ENABLE_DIGITAL_LAB)
 ADD_DEFINITIONS(
     -DENABLE_DIGITAL_LAB=1
 )
+IF(MSVC)
+	SET (ENABLE_LIQUID_EXPERIMENTAL OFF CACHE BOOL "Enable experimental liquid-dsp features (requires latest liquid-dsp installed)")
+ELSE()
+	SET (ENABLE_LIQUID_EXPERIMENTAL ON CACHE BOOL "Enable experimental liquid-dsp features (requires latest liquid-dsp installed)")
+ENDIF()
+IF(ENABLE_LIQUID_EXPERIMENTAL)
+ADD_DEFINITIONS(
+    -DENABLE_LIQUID_EXPERIMENTAL=1
+)
+ENDIF()
 ENDIF()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -296,7 +306,6 @@ IF(ENABLE_DIGITAL_LAB)
         src/modules/modem/digital/ModemAPSK.cpp
         src/modules/modem/digital/ModemBPSK.cpp
         src/modules/modem/digital/ModemDPSK.cpp
-        src/modules/modem/digital/ModemFSK.cpp
         src/modules/modem/digital/ModemGMSK.cpp
         src/modules/modem/digital/ModemPSK.cpp
         src/modules/modem/digital/ModemOOK.cpp
@@ -305,6 +314,12 @@ IF(ENABLE_DIGITAL_LAB)
         src/modules/modem/digital/ModemQAM.cpp
         src/modules/modem/digital/ModemQPSK.cpp
     )
+	IF(ENABLE_LIQUID_EXPERIMENTAL)
+    SET (cubicsdr_sources
+        ${cubicsdr_sources}
+        src/modules/modem/digital/ModemFSK.cpp
+    )
+	ENDIF()
 ENDIF()
 
 SET (cubicsdr_headers
@@ -402,7 +417,6 @@ SET (cubicsdr_headers
     src/modules/modem/digital/ModemAPSK.h
     src/modules/modem/digital/ModemBPSK.h
     src/modules/modem/digital/ModemDPSK.h
-    src/modules/modem/digital/ModemFSK.h
     src/modules/modem/digital/ModemGMSK.h
     src/modules/modem/digital/ModemPSK.h
     src/modules/modem/digital/ModemOOK.h
@@ -411,6 +425,12 @@ SET (cubicsdr_headers
     src/modules/modem/digital/ModemQAM.h
     src/modules/modem/digital/ModemQPSK.h
 )    
+IF(ENABLE_LIQUID_EXPERIMENTAL)
+    SET (cubicsdr_sources
+        ${cubicsdr_sources}
+        src/modules/modem/digital/ModemFSK.h
+    )
+ENDIF()
 ENDIF()
 
 SET (CUBICSDR_RESOURCES 
diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp
index e480765..23eebec 100644
--- a/src/CubicSDR.cpp
+++ b/src/CubicSDR.cpp
@@ -177,7 +177,9 @@ bool CubicSDR::OnInit() {
     Modem::addModemFactory(new ModemASK);
     Modem::addModemFactory(new ModemBPSK);
     Modem::addModemFactory(new ModemDPSK);
+#if ENABLE_LIQUID_EXPERIMENTAL
     Modem::addModemFactory(new ModemFSK);
+#endif
     Modem::addModemFactory(new ModemGMSK);
     Modem::addModemFactory(new ModemOOK);
     Modem::addModemFactory(new ModemPSK);
diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index 381b308..5895f6b 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -42,7 +42,9 @@
 #include "ModemASK.h"
 #include "ModemBPSK.h"
 #include "ModemDPSK.h"
+#if ENABLE_LIQUID_EXPERIMENTAL
 #include "ModemFSK.h"
+#endif
 #include "ModemGMSK.h"
 #include "ModemOOK.h"
 #include "ModemPSK.h"