diff --git a/README_waf.txt b/README_waf.txt
index f90e3d7ad4..7d27055043 100644
--- a/README_waf.txt
+++ b/README_waf.txt
@@ -25,8 +25,8 @@ calling just 'waf' is enough
 It's possible to build for just a vehicle or an example by specifying it as the
 target:
 
-    # From the top directory, note the board name used in the target
-    waf --target ArduCopter.linux
+    # From the top directory
+    waf --target ArduCopter
 
     # List all the targets available
     waf list
diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index bcfe527202..d3ffeea38b 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -90,6 +90,7 @@ def program(bld, **kw):
     target = bld.bldnode.make_node(name + '.' + bld.env.BOARD)
     bld.program(
         target=target,
+        name=name,
         **kw
     )