diff --git a/Documentation/flight_mode_state_machine.odg b/Documentation/flight_mode_state_machine.odg
index b630ecb402..f9fa7a0323 100644
Binary files a/Documentation/flight_mode_state_machine.odg and b/Documentation/flight_mode_state_machine.odg differ
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index 74be1cd23f..3f88b8c8c9 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -39,6 +39,7 @@ MODULES		+= modules/sensors
 # System commands
 #
 MODULES		+= systemcmds/eeprom
+MODULES		+= systemcmds/ramtron
 MODULES		+= systemcmds/bl_update
 MODULES		+= systemcmds/boardinfo
 MODULES		+= systemcmds/i2c
diff --git a/src/systemcmds/ramtron/ramtron.c b/src/systemcmds/ramtron/ramtron.c
index 5e9499c553..03c713987a 100644
--- a/src/systemcmds/ramtron/ramtron.c
+++ b/src/systemcmds/ramtron/ramtron.c
@@ -63,6 +63,15 @@
 
 __EXPORT int ramtron_main(int argc, char *argv[]);
 
+#ifndef CONFIG_MTD_RAMTRON
+
+/* create a fake command with decent message to not confuse users */
+int ramtron_main(int argc, char *argv[])
+{
+	errx(1, "RAMTRON not enabled, skipping.");
+}
+#else
+
 static void	ramtron_attach(void);
 static void	ramtron_start(void);
 static void	ramtron_erase(void);
@@ -266,3 +275,5 @@ ramtron_test(void)
 //	at24c_test();
 	exit(0);
 }
+
+#endif