diff --git a/README_waf.txt b/README_waf.txt
index 7d27055043..038418ae5d 100644
--- a/README_waf.txt
+++ b/README_waf.txt
@@ -31,6 +31,10 @@ target:
     # List all the targets available
     waf list
 
+There are also shortcuts for vehicle builds, for example:
+    # Shortcut for waf --targets ArduCopter
+    waf copter
+
 By default all the files produced by the build will be inside the build/
 subdirectory. The binaries will also be there, with the name identifying
 the target board.
diff --git a/wscript b/wscript
index 5ba1132e48..8ab30d9aeb 100644
--- a/wscript
+++ b/wscript
@@ -185,3 +185,7 @@ def build(bld):
 class CheckContext(BuildContext):
     '''executes tests after build'''
     cmd = 'check'
+
+copter = ardupilotwaf.build_shortcut(targets='ArduCopter')
+plane = ardupilotwaf.build_shortcut(targets='ArduPlane')
+rover = ardupilotwaf.build_shortcut(targets='APMrover2')