diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index f1bedceba3be099b7f12d6507d69c307dba187d6..edb2eb0eee8590e2fb5dca2098049d7bc6918694 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -1069,7 +1069,7 @@ def SetClusterParams(opts, args):
                                   hv_state=hv_state,
                                   disk_state=disk_state,
                                   )
-  SubmitOpCode(op, opts=opts)
+  SubmitOrSend(op, opts)
   return 0
 
 
@@ -1550,7 +1550,7 @@ commands = {
      DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT,
      RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT,
      NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT, HV_STATE_OPT,
-     DISK_STATE_OPT] +
+     DISK_STATE_OPT, SUBMIT_OPT] +
     INSTANCE_POLICY_OPTS,
     "[opts...]",
     "Alters the parameters of the cluster"),
diff --git a/man/gnt-cluster.rst b/man/gnt-cluster.rst
index 97a9443fb1d3092f5a142ab151e345053e4633ba..d54368200d3a2f58d044fa752ddc3b10c2ada6db 100644
--- a/man/gnt-cluster.rst
+++ b/man/gnt-cluster.rst
@@ -554,7 +554,7 @@ be 1.
 MODIFY
 ~~~~~~
 
-| **modify**
+| **modify** [\--submit]
 | [\--vg-name *vg-name*]
 | [\--no-lvm-storage]
 | [\--enabled-hypervisors *hypervisors*]
@@ -596,7 +596,7 @@ The ``--vg-name``, ``--no-lvm-storarge``, ``--enabled-hypervisors``,
 command.
 
 The ``--hypervisor-state`` and ``--disk-state`` options are described in
-detail in **ganeti**(7).
+detail in **ganeti(7)**.
 
 The ``--add-uids`` and ``--remove-uids`` options can be used to
 modify the user-id pool by adding/removing a list of user-ids or
@@ -621,6 +621,9 @@ command. To clear the default iallocator, just pass an empty string
 The ``--specs-...`` and ``--ipol-disk-templates`` options are described
 in the **init** command.
 
+See **ganeti(7)** for a description of ``--submit`` and other common
+options.
+
 QUEUE
 ~~~~~