diff --git a/Tools/ardupilotwaf/ardupilotwaf.py b/Tools/ardupilotwaf/ardupilotwaf.py
index 66bbf1bc7e..d426731799 100644
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@@ -321,11 +321,19 @@ def options(opt):
              'examples. The special group "all" selects all programs.',
     )
 
+    g.add_option('--upload',
+        action='store_true',
+        help='Upload applicable targets to a connected device. Not all ' +
+             'platforms may support this. Example: `waf copter --upload` ' +
+             'means "build arducopter and upload it to my board".',
+    )
+
     g = opt.ap_groups['check']
     g.add_option('--check-verbose',
                  action='store_true',
                  help='Output all test programs')
 
+
 def build(bld):
     global LAST_IDX
     # FIXME: This is done to prevent same task generators being created with