diff --git a/Authors b/Authors
index 0db21f28..b1893f5e 100644
--- a/Authors
+++ b/Authors
@@ -58,6 +58,7 @@ Devdeep Singh <devdeep.singh@citrix.com>
 Devendra Modium <dmodium@isi.edu>
 Devin Carlen <devin.carlen@gmail.com>
 Dina Belova <dbelova@mirantis.com>
+Dominik Heidler <dheidler@suse.de>
 Don Dugger <donald.d.dugger@intel.com>
 Donal Lafferty <donal.lafferty@citrix.com>
 Dong-In David Kang <dkang@isi.edu>
diff --git a/bin/nova-manage b/bin/nova-manage
index 6bda2ada..5aa841a0 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1692,6 +1692,18 @@ def main():
             print "\t%s" % k
         sys.exit(2)
     category = argv.pop(0)
+    if category == "bash-completion":
+        if len(argv) < 1:
+            print " ".join([k for (k, v) in CATEGORIES])
+        else:
+            query_category = argv.pop(0)
+            matches = lazy_match(query_category, CATEGORIES)
+            # instantiate the command group object
+            category, fn = matches[0]
+            command_object = fn()
+            actions = methods_of(command_object)
+            print " ".join([k for (k, v) in actions])
+        sys.exit(0)
     matches = lazy_match(category, CATEGORIES)
     # instantiate the command group object
     category, fn = matches[0]