diff --git a/lib/cli.py b/lib/cli.py
index ae17be75698a68c91e8cd1d4a8e0760dc39e9f73..5ec00ec8622d86bb65b95d957dfc2b741beaf47d 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -87,6 +87,7 @@ __all__ = [
   "NONICS_OPT",
   "NONLIVE_OPT",
   "NONPLUS1_OPT",
+  "NOSHUTDOWN_OPT",
   "NOSTART_OPT",
   "NOSSH_KEYCHECK_OPT",
   "NOVOTING_OPT",
@@ -804,6 +805,11 @@ IGNORE_SECONDARIES_OPT = cli_option("--ignore-secondaries",
                                     default=False, action="store_true",
                                     help="Ignore errors from secondaries")
 
+NOSHUTDOWN_OPT = cli_option("","--noshutdown", dest="shutdown",
+                            action="store_false", default=True,
+                            help="Don't shutdown the instance (unsafe)")
+
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index 376c3b5cc75fb481291e6d53a1097742391959c3..71ecfc7f54bebfdc4d6936e119f51cd1e05b861b 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -233,10 +233,7 @@ commands = {
            [DEBUG_OPT, NODE_LIST_OPT],
            "", "Lists instance exports available in the ganeti cluster"),
   'export': (ExportInstance, ARGS_ONE_INSTANCE,
-             [DEBUG_OPT, FORCE_OPT, SINGLE_NODE_OPT,
-              cli_option("","--noshutdown", dest="shutdown",
-                         action="store_false", default=True,
-                         help="Don't shutdown the instance (unsafe)"), ],
+             [DEBUG_OPT, FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT]
              "-n <target_node> [opts...] <name>",
              "Exports an instance to an image"),
   'import': (ImportInstance, ARGS_ONE_INSTANCE, import_opts,