diff --git a/ArduCopter/Makefile b/ArduCopter/Makefile
index 1d9b6a022d..6feb7629ff 100644
--- a/ArduCopter/Makefile
+++ b/ArduCopter/Makefile
@@ -1 +1,25 @@
 include ../libraries/AP_Common/Arduino.mk
+
+nologging:
+	make -f Makefile EXTRAFLAGS="-DLOGGING_ENABLED=DISABLED"
+
+nogps:
+	make -f Makefile EXTRAFLAGS="-DGPS_PROTOCOL=GPS_PROTOCOL_NONE -DLOGGING_ENABLED=DISABLED"
+
+hil:
+	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCLI_SLIDER_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
+
+hilnocli:
+	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
+
+heli:
+	make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"
+
+purple:
+	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_PURPLE -DCLI_SLIDER_ENABLED=DISABLED"
+
+mavlink10:
+	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
+
+etags:
+	cd .. && etags -f ArduCopter/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduCopter libraries)
diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile
index 1d9b6a022d..1c8eb7e765 100644
--- a/ArduPlane/Makefile
+++ b/ArduPlane/Makefile
@@ -1 +1,25 @@
 include ../libraries/AP_Common/Arduino.mk
+
+nologging:
+	make -f Makefile EXTRAFLAGS="-DLOGGING_ENABLED=DISABLED"
+
+nogps:
+	make -f Makefile EXTRAFLAGS="-DGPS_PROTOCOL=GPS_PROTOCOL_NONE -DLOGGING_ENABLED=DISABLED"
+
+hil:
+	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCLI_SLIDER_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
+
+hilnocli:
+	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
+
+heli:
+	make -f Makefile EXTRAFLAGS="-DFRAME_CONFIG=HELI_FRAME"
+
+purple:
+	make -f Makefile EXTRAFLAGS="-DCONFIG_APM_HARDWARE=APM_HARDWARE_PURPLE -DCLI_SLIDER_ENABLED=DISABLED"
+
+mavlink10:
+	make -f Makefile EXTRAFLAGS="-DHIL_MODE=HIL_MODE_ATTITUDE -DMAVLINK10 -DCLI_ENABLED=DISABLED -DLOGGING_ENABLED=DISABLED"
+
+etags:
+	cd .. && etags -f ArduPlane/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduPlane libraries)