diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e6eaa..0b00cdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -340,6 +340,7 @@ SET (cubicsdr_sources
     src/modules/modem/ModemAnalog.cpp
     src/modules/modem/ModemDigital.cpp
     src/modules/modem/analog/ModemAM.cpp
+    src/modules/modem/analog/ModemCW.cpp
     src/modules/modem/analog/ModemDSB.cpp
     src/modules/modem/analog/ModemFM.cpp
     src/modules/modem/analog/ModemNBFM.cpp
@@ -449,6 +450,7 @@ SET (cubicsdr_headers
     src/modules/modem/ModemAnalog.h
     src/modules/modem/ModemDigital.h
     src/modules/modem/analog/ModemAM.h
+    src/modules/modem/analog/ModemCW.h
     src/modules/modem/analog/ModemDSB.h
     src/modules/modem/analog/ModemFM.h
     src/modules/modem/analog/ModemNBFM.h
diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index e75f791..d75eb5e 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -798,7 +798,7 @@ WaterfallCanvas *AppFrame::makeWaterfallCanvas(wxWindow *parent, const wxGLAttri
 }
 
 ModeSelectorCanvas *AppFrame::makeModemSelectorPanel(wxWindow *parent, const wxGLAttributes &attribList) {
-    vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "LSB", "USB", "DSB", "I/Q" };
+    vector<string> modemList = {"FM", "FMS", "NBFM", "AM", "CW", "LSB", "USB", "DSB", "I/Q" };
 
 #ifdef CUBICSDR_MODEM_EXCLUDE
     std::string excludeListStr = "" CUBICSDR_MODEM_EXCLUDE;
diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp
index e5dba5f..a5690fa 100644
--- a/src/CubicSDR.cpp
+++ b/src/CubicSDR.cpp
@@ -306,6 +306,7 @@ bool CubicSDR::OnInit() {
     Modem::addModemFactory(ModemNBFM::factory, "NBFM", 12500);
     Modem::addModemFactory(ModemFMStereo::factory, "FMS", 200000);
     Modem::addModemFactory(ModemAM::factory, "AM", 6000);
+    Modem::addModemFactory(ModemCW::factory, "CW", 500);
     Modem::addModemFactory(ModemLSB::factory, "LSB", 5400);
     Modem::addModemFactory(ModemUSB::factory, "USB", 5400);
     Modem::addModemFactory(ModemDSB::factory, "DSB", 5400);
diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index b3102e6..12f34ee 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -34,6 +34,7 @@
 #include "ModemFM.h"
 #include "ModemNBFM.h"
 #include "ModemFMStereo.h"
+#include "ModemCW.h"
 #include "ModemAM.h"
 #include "ModemUSB.h"
 #include "ModemLSB.h"