diff --git a/lib/cli.py b/lib/cli.py
index dc548dec8e706e87039dabd19ba4b7d1f2c983cc..2d6dc220ac265913fec98faace0d15c23b50e48d 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -44,6 +44,7 @@ from optparse import (OptionParser, TitledHelpFormatter,
 
 __all__ = [
   # Command line options
+  "ALL_OPT",
   "BACKEND_OPT",
   "CLEANUP_OPT",
   "CONFIRM_OPT",
@@ -617,6 +618,12 @@ STATIC_OPT = cli_option("-s", "--static", dest="static",
                         action="store_true", default=False,
                         help="Only show configuration data, not runtime data")
 
+ALL_OPT = cli_option("--all", dest="show_all",
+                     default=False, action="store_true",
+                     help="Show info on all instances on the cluster."
+                     " This can take a long time to run, use wisely")
+
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 646013d9a8b61cc5ddd87fd95f24fece4b72c9bf..0a1e5ee3c715e71bebafc4beccd30633c8544d20 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1404,12 +1404,8 @@ commands = {
            "Move instance to an arbitrary node"
            " (only for instances of type file and lv)"),
   'info': (ShowInstanceConfig, ARGS_MANY_INSTANCES,
-           [DEBUG_OPT, STATIC_OPT,
-            cli_option("--all", dest="show_all",
-                       default=False, action="store_true",
-                       help="Show info on all instances on the cluster."
-                       " This can take a long time to run, use wisely."),
-            ], "[-s] {--all | <instance>...}",
+           [DEBUG_OPT, STATIC_OPT, ALL_OPT],
+           "[-s] {--all | <instance>...}",
            "Show information on the specified instance(s)"),
   'list': (ListInstances, ARGS_MANY_INSTANCES,
            [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, SYNC_OPT],