diff --git a/lib/cli.py b/lib/cli.py
index 6e3621dfd85be96bf7a7b76c0b984c04a7ed9a65..db0ed6c7d75cb2009f70054839072478430d56aa 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -74,6 +74,7 @@ __all__ = [
   "NOSTART_OPT",
   "NWSYNC_OPT",
   "ON_PRIMARY_OPT",
+  "ON_SECONDARY_OPT",
   "OS_OPT",
   "OS_SIZE_OPT",
   "SELECT_OS_OPT",
@@ -648,6 +649,11 @@ ON_PRIMARY_OPT = cli_option("-p", "--on-primary", dest="on_primary",
                             help="Replace the disk(s) on the primary"
                             " node (only for the drbd template)")
 
+ON_SECONDARY_OPT = cli_option("-s", "--on-secondary", dest="on_secondary",
+                              default=False, action="store_true",
+                              help="Replace the disk(s) on the secondary"
+                              " node (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 53d374d070239061fe5ecbcede4f76371f6f1fc3..b06f6d10d5348d2226f756f6252adbe8557a6bb6 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1438,10 +1438,7 @@ commands = {
                     [DEBUG_OPT,
                      NEW_SECONDARY_OPT,
                      ON_PRIMARY_OPT,
-                     cli_option("-s", "--on-secondary", dest="on_secondary",
-                                default=False, action="store_true",
-                                help=("Replace the disk(s) on the secondary"
-                                      " node (only for the drbd template)")),
+                     ON_SECONDARY_OPT,
                      cli_option("-a", "--auto", dest="auto",
                                 default=False, action="store_true",
                                 help=("Automatically replace faulty disks"