diff --git a/ArduSub/Makefile.waf b/ArduSub/Makefile.waf
index 505aa5979a..23e85e58f5 100644
--- a/ArduSub/Makefile.waf
+++ b/ArduSub/Makefile.waf
@@ -1,2 +1,2 @@
 all:
-	@$(MAKE) -C ../ -f Makefile.waf copter
+	@$(MAKE) -C ../ -f Makefile.waf sub
diff --git a/ArduSub/wscript b/ArduSub/wscript
index 1a527c1dfa..de2c3e0066 100644
--- a/ArduSub/wscript
+++ b/ArduSub/wscript
@@ -1,15 +1,12 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-import ardupilotwaf
-
 def build(bld):
     vehicle = bld.path.name
-    ardupilotwaf.vehicle_stlib(
-        bld,
+    bld.ap_stlib(
         name=vehicle + '_libs',
         vehicle=vehicle,
-        libraries=ardupilotwaf.COMMON_VEHICLE_DEPENDENT_LIBRARIES + [
+        libraries=bld.ap_common_vehicle_libraries() + [
             'AP_ADSB',
             'AC_AttitudeControl',
             'AC_Fence',
@@ -36,8 +33,7 @@ def build(bld):
         use='mavlink',
     )
 
-    ardupilotwaf.program(
-        bld,
+    bld.ap_program(
         program_name='ardusub',
         use=vehicle + '_libs',
     )