diff --git a/lib/cli.py b/lib/cli.py
index 90cd23ab40d5a7dc26e1a46df249d047aa5f8b1c..798f866fd15ddaf466aa95d856c68c6ac5ec8f24 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -74,6 +74,7 @@ __all__ = [
   "NONICS_OPT",
   "NONLIVE_OPT",
   "NOSTART_OPT",
+  "NOSSH_KEYCHECK_OPT",
   "NWSYNC_OPT",
   "ON_PRIMARY_OPT",
   "ON_SECONDARY_OPT",
@@ -686,6 +687,10 @@ READD_OPT = cli_option("--readd", dest="readd",
                        default=False, action="store_true",
                        help="Readd old node after replacing it")
 
+NOSSH_KEYCHECK_OPT = cli_option("--no-ssh-key-check", dest="ssh_key_check",
+                                default=True, action="store_false",
+                                help="Disable SSH key fingerprint checking")
+
 
 def _ParseArgs(argv, commands, aliases):
   """Parser for the command line arguments.
diff --git a/scripts/gnt-node b/scripts/gnt-node
index 61b86f1b3063aa05f7c87556d585ea93effc0af7..ffaf8af84a1980b5040ef737611544f22fd9c353 100755
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -626,9 +626,7 @@ commands = {
           [DEBUG_OPT,
            SECONDARY_IP_OPT,
            READD_OPT,
-           cli_option("--no-ssh-key-check", dest="ssh_key_check",
-                      default=True, action="store_false",
-                      help="Disable SSH key fingerprint checking"),
+           NOSSH_KEYCHECK_OPT,
            ],
           "[-s ip] [--readd] [--no-ssh-key-check] <node_name>",
           "Add a node to the cluster"),