diff --git a/system/cdcacm/CMakeLists.txt b/system/cdcacm/CMakeLists.txt
index f66806d03..d29b7bad8 100644
--- a/system/cdcacm/CMakeLists.txt
+++ b/system/cdcacm/CMakeLists.txt
@@ -19,5 +19,7 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_CDCACM)
-  nuttx_add_application(NAME cdcacm)
+  nuttx_add_application(NAME sercon SRCS cdcacm_main.c)
+
+  nuttx_add_application(NAME serdis)
 endif()
diff --git a/system/critmon/CMakeLists.txt b/system/critmon/CMakeLists.txt
index 625b250e1..9271f0b0d 100644
--- a/system/critmon/CMakeLists.txt
+++ b/system/critmon/CMakeLists.txt
@@ -19,5 +19,8 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_CRITMONITOR)
-  nuttx_add_application(NAME critmon)
+  nuttx_add_application(NAME critmon SRCS critmon.c)
+
+  nuttx_add_application(NAME critmon_start)
+  nuttx_add_application(NAME critmon_stop)
 endif()
diff --git a/system/stackmonitor/CMakeLists.txt b/system/stackmonitor/CMakeLists.txt
index 69cd1c41d..ad231b60b 100644
--- a/system/stackmonitor/CMakeLists.txt
+++ b/system/stackmonitor/CMakeLists.txt
@@ -19,5 +19,7 @@
 # ##############################################################################
 
 if(CONFIG_SYSTEM_STACKMONITOR)
-  nuttx_add_application(NAME stackmonitor)
+  nuttx_add_application(NAME stackmonitor_start SRCS stackmonitor.c)
+
+  nuttx_add_application(NAME stackmonitor_stop)
 endif()