diff --git a/autotools/build-bash-completion b/autotools/build-bash-completion
index 7368dab32131c376484f6276a7f5e667b618594c..cb738cdd62664ed564291dd001efe5b90edce251 100755
--- a/autotools/build-bash-completion
+++ b/autotools/build-bash-completion
@@ -584,6 +584,14 @@ def GetCommands(filename, module):
     raise Exception("Script %s doesn't have 'commands' attribute" %
                     filename)
 
+  # Add the implicit "--help" option
+  help_option = cli.cli_option("-h", "--help", default=False,
+                               action="store_true")
+
+  for (_, _, optdef, _, _) in commands.itervalues():
+    if help_option not in optdef:
+      optdef.append(help_option)
+
   # Use aliases
   aliases = getattr(module, "aliases", {})
   if aliases: