diff --git a/lib/cli.py b/lib/cli.py
index db0ed6c7d75cb2009f70054839072478430d56aa..23106bd1fb858b70c8d182b0e8b5597df52df0c5 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -45,6 +45,7 @@ from optparse import (OptionParser, TitledHelpFormatter,
 __all__ = [
   # Command line options
   "ALL_OPT",
+  "AUTO_REPLACE_OPT",
   "BACKEND_OPT",
   "CLEANUP_OPT",
   "CONFIRM_OPT",
@@ -654,6 +655,11 @@ ON_SECONDARY_OPT = cli_option("-s", "--on-secondary", dest="on_secondary",
                               help="Replace the disk(s) on the secondary"
                               " node (only for the drbd template)")
 
+AUTO_REPLACE_OPT = cli_option("-a", "--auto", dest="auto",
+                              default=False, action="store_true",
+                              help="Automatically replace faulty disks"
+                              " (only for the drbd template)")
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index b06f6d10d5348d2226f756f6252adbe8557a6bb6..7a7f734bd8e0cc503452b6e070b83e876f7d528a 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1439,10 +1439,7 @@ commands = {
                      NEW_SECONDARY_OPT,
                      ON_PRIMARY_OPT,
                      ON_SECONDARY_OPT,
-                     cli_option("-a", "--auto", dest="auto",
-                                default=False, action="store_true",
-                                help=("Automatically replace faulty disks"
-                                      " (only for the drbd template)")),
+                     AUTO_REPLACE_OPT,
                      DISKIDX_OPT,
                      IALLOCATOR_OPT,
                      SUBMIT_OPT,