diff --git a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
index df10ed4b87..86c97b2377 100644
--- a/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
+++ b/Tools/ardupilotwaf/px4/cmake/configs/nuttx_px4fmu-common_apm.cmake
@@ -45,6 +45,7 @@ set(config_module_list
     systemcmds/reflect
     systemcmds/motor_test
     systemcmds/usb_connected
+    systemcmds/otp
 
 #
 # Library modules
diff --git a/mk/PX4/px4_common.mk b/mk/PX4/px4_common.mk
index 3fdeba1f43..6253d8dd15 100644
--- a/mk/PX4/px4_common.mk
+++ b/mk/PX4/px4_common.mk
@@ -49,6 +49,7 @@ MODULES		+= systemcmds/top
 MODULES		+= systemcmds/nshterm
 MODULES         += systemcmds/mtd
 MODULES         += systemcmds/ver
+MODULES         += systemcmds/otp
 
 ifneq ($(wildcard $(PX4_ROOT)/src/systemcmds/reflect),)  
 MODULES         += systemcmds/reflect