diff --git a/Tools/scripts/build_all.sh b/Tools/scripts/build_all.sh
index a2dac69b4d..4f7d49f3b3 100755
--- a/Tools/scripts/build_all.sh
+++ b/Tools/scripts/build_all.sh
@@ -8,7 +8,7 @@ set -x
 
 echo "Testing ArduPlane build"
 pushd ArduPlane
-for b in all apm2 apm2beta hil hilsensors hil-apm2 hilsensors-apm2 sitl sitl-mount sitl-newcontrollers; do
+for b in all apm2 apm2beta apm1-hil apm1-hilsensors apm2-hil apm2-hilsensors sitl sitl-mount sitl-newcontrollers; do
     pwd
     make clean
     make $b
@@ -17,7 +17,7 @@ popd
 
 echo "Testing ArduCopter build"
 pushd ArduCopter
-for b in all apm2 apm2beta hil sitl heli dmp; do
+for b in all apm2 apm2beta apm1-hil apm2-hil sitl heli dmp; do
     pwd
     make clean
     make $b
diff --git a/mk/targets.mk b/mk/targets.mk
index 8e9744dd59..6ccc52d9a5 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -9,6 +9,7 @@ clidisabled-nologging: EXTRAFLAGS += "-DCLI_ENABLED=DISABLED "
 clidisabled-nologging: nologging
 
 hil: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_ATTITUDE "
+hil: apm1
 
 hilsensors: EXTRAFLAGS += "-DHIL_MODE=HIL_MODE_SENSORS "
 
@@ -57,6 +58,9 @@ obc: EXTRAFLAGS += "-DTELEMETRY_UART2=ENABLED "
 obc: EXTRAFLAGS += "-DSERIAL_BUFSIZE=512 "
 obc: apm2
 
+sitl-mount: EXTRAFLAGS += "-DMOUNT=ENABLED"
+sitl-mount: sitl
+
 etags:
 	cd .. && etags -f ArduCopter/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduCopter libraries)