diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile
index c13b974b8e..6d7f260401 100644
--- a/ArduPlane/Makefile
+++ b/ArduPlane/Makefile
@@ -48,9 +48,6 @@ mtk16: all
 heli: EXTRAFLAGS += "-DFRAME_CONFIG=HELI_FRAME "
 heli: all
 
-apm2: HAL_BOARD = "HAL_BOARD_APM2"
-apm2: all
-
 apm2-nologging: HAL_BOARD = "HAL_BOARD_APM2"
 apm2-nologging: nologging
 
@@ -60,9 +57,6 @@ apm2-uart2: apm2
 apm2beta: EXTRAFLAGS += "-DAPM2_BETA_HARDWARE "
 apm2beta: apm2
 
-sitl: HAL_BOARD = "HAL_BOARD_AVR_SITL"
-sitl: all
-
 sitl-mount: EXTRAFLAGS += "-DMOUNT=ENABLED"
 sitl-mount: sitl
 
diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk
index cb4b3fa3a0..aa07105d0d 100644
--- a/libraries/AP_Common/Arduino.mk
+++ b/libraries/AP_Common/Arduino.mk
@@ -456,6 +456,16 @@ endif
 
 all:	$(SKETCHELF) $(SKETCHEEP) $(SKETCHHEX)
 
+# convenient targets for our supported boards
+sitl:
+	make -f Makefile HAL_BOARD=HAL_BOARD_AVR_SITL 
+
+apm1:
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM1
+
+apm2:
+	make -f Makefile HAL_BOARD=HAL_BOARD_APM2
+
 .PHONY: upload
 upload: $(SKETCHHEX)
 	$(AVRDUDE) -c $(UPLOAD_PROTOCOL) -p $(MCU) -P $(PORT) -b$(UPLOAD_SPEED) $(USERAVRDUDEFLAGS) -U flash:w:$(SKETCHHEX):i