diff --git a/lib/cli.py b/lib/cli.py
index 292cab08f26fd9cf66b94149f527cbb1863839a8..f79738118545d7f2a7f9d7720a966a4661724bcb 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -103,6 +103,7 @@ __all__ = [
   "SELECT_OS_OPT",
   "SEP_OPT",
   "SHOWCMD_OPT",
+  "SHUTDOWN_TIMEOUT_OPT",
   "SINGLE_NODE_OPT",
   "SRC_DIR_OPT",
   "SRC_NODE_OPT",
@@ -820,6 +821,11 @@ TIMEOUT_OPT = cli_option("--timeout", dest="timeout", type="int",
                          default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
                          help="Maximum time to wait")
 
+SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout", dest="timeout",
+                         type="int",
+                         default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
+                         help="Maximum time to wait for instance shutdown")
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.