diff --git a/Makefile b/Makefile
index d0ffeb7402..e87513e785 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,8 @@ include $(PX4_BASE)makefiles/setup.mk
 #
 # Canned firmware configurations that we build.
 #
-CONFIGS			?= px4fmu_default px4io_default
+CONFIGS			?= $(subst config_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)config_*.mk))))
+#CONFIGS			?= px4fmu_default px4io_default
 
 #
 # Boards that we build NuttX export kits for.
@@ -162,9 +163,7 @@ help:
 	@echo ""
 	@echo "  all"
 	@echo "    Build all firmware configs: $(CONFIGS)"
-	@echo "    A limited set of configs can be built with:"
-	@echo ""
-	@echo "      CONFIGS=<list-of-configs>"
+	@echo "    A limited set of configs can be built with CONFIGS=<list-of-configs>"
 	@echo ""
 	@for config in $(CONFIGS); do \
 		echo "  $$config"; \
diff --git a/makefiles/board_px4fmu.mk b/makefiles/board_px4fmu.mk
index 959e4ed263..8370696446 100644
--- a/makefiles/board_px4fmu.mk
+++ b/makefiles/board_px4fmu.mk
@@ -1,5 +1,5 @@
 #
-# Platform-specific definitions for the PX4FMU
+# Board-specific definitions for the PX4FMU
 #
 
 #
diff --git a/makefiles/board_px4fmuv2.mk b/makefiles/board_px4fmuv2.mk
new file mode 100644
index 0000000000..4b3b7e5854
--- /dev/null
+++ b/makefiles/board_px4fmuv2.mk
@@ -0,0 +1,10 @@
+#
+# Board-specific definitions for the PX4FMUv2
+#
+
+#
+# Configure the toolchain
+#
+CONFIG_ARCH			 = CORTEXM4F
+
+include $(PX4_MK_DIR)/toolchain_gnu-arm-eabi.mk
diff --git a/makefiles/board_px4io.mk b/makefiles/board_px4io.mk
index 275014aba5..b0eb2dae79 100644
--- a/makefiles/board_px4io.mk
+++ b/makefiles/board_px4io.mk
@@ -1,5 +1,5 @@
 #
-# Platform-specific definitions for the PX4IO
+# Board-specific definitions for the PX4IO
 #
 
 #