diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0c525d6a..06a5e838d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,8 @@ option(ENABLE_CHANNELRX_DEMODPACKET "Enable channelrx demodpacket plugin" ON)
 option(ENABLE_CHANNELRX_DEMODAPT "Enable channelrx demodapt plugin" ON)
 option(ENABLE_CHANNELRX_DEMODDSD "Enable channelrx demoddsd plugin" ON)
 option(ENABLE_CHANNELRX_DEMODFT8 "Enable channelrx demodft8 plugin" ON)
+option(ENABLE_CHANNELRX_DEMODNAVTEX "Enable channelrx demodnavtex plugin" ON)
+option(ENABLE_CHANNELRX_DEMODRTTY "Enable channelrx demodrtty plugin" ON)
 
 # Channel Tx enablers
 option(ENABLE_CHANNELTX "Enable channeltx plugins" ON)
diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt
index e0350abc5..9270f0fee 100644
--- a/plugins/channelrx/CMakeLists.txt
+++ b/plugins/channelrx/CMakeLists.txt
@@ -113,6 +113,14 @@ if (ENABLE_CHANNELRX_DEMODFT8 AND FT8_SUPPORT)
     add_subdirectory(demodft8)
 endif()
 
+if (ENABLE_CHANNELRX_DEMODNAVTEX)
+    add_subdirectory(demodnavtex)
+endif()
+
+if (ENABLE_CHANNELRX_DEMODRTTY)
+    add_subdirectory(demodrtty)
+endif()
+
 if(NOT SERVER_MODE)
     add_subdirectory(heatmap)
 
diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt
index 12fd1f08f..50c2efdde 100644
--- a/sdrbase/CMakeLists.txt
+++ b/sdrbase/CMakeLists.txt
@@ -176,6 +176,7 @@ set(sdrbase_SOURCES
     util/aprs.cpp
     util/astronomy.cpp
     util/azel.cpp
+    util/baudot.cpp
     util/colormap.cpp
     util/coordinates.cpp
     util/crc.cpp
@@ -195,6 +196,7 @@ set(sdrbase_SOURCES
     util/message.cpp
     util/messagequeue.cpp
     util/morse.cpp
+    util/navtex.cpp
     util/openaip.cpp
     util/osndb.cpp
     util/ourairportsdb.cpp
@@ -399,6 +401,7 @@ set(sdrbase_HEADERS
     util/aprs.h
     util/astronomy.h
     util/azel.h
+    util/baudot.h
     util/colormap.h
     util/coordinates.h
     util/CRC64.h
@@ -423,6 +426,8 @@ set(sdrbase_HEADERS
     util/messagequeue.h
     util/morse.h
     util/movingaverage.h
+    util/movingmaximum.h
+    util/navtex.h
     util/openaip.h
     util/osndb.h
     util/outairportsdb.h