diff --git a/NEWS b/NEWS
index 377c04b8bc0bc40408bb919b102eff619c46ead4..172277a512a2c029dc1a07ae0665084469e1411a 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ Version 2.5.0 beta1
   since Ganeti 2.1.3 and :doc:`documented <rapi>`, instead.
 - Pyparsing 1.4.6 or above is required, see :doc:`installation
   documentation <install>`
+- The "cluster-verify" hooks are now executed per group by the
+  OP_CLUSTER_VERIFY_GROUP opcode. This maintains the same behavior if
+  you just run "gnt-cluster verify", which generates one op per group.
 
 
 Version 2.4.3
diff --git a/doc/hooks.rst b/doc/hooks.rst
index 8e260aab9bd0465328925e0a4d250c7ed43ec867..77e9330a5bdaead2f4962ff9b98dd69d8806c03a 100644
--- a/doc/hooks.rst
+++ b/doc/hooks.rst
@@ -419,10 +419,10 @@ operation and not after its completion.
 :pre-execution: none
 :post-execution: master node
 
-OP_CLUSTER_VERIFY
-+++++++++++++++++
+OP_CLUSTER_VERIFY_GROUP
++++++++++++++++++++++++
 
-Verifies the cluster status. This is a special LU with regard to
+Verifies all nodes in a group. This is a special LU with regard to
 hooks, as the result of the opcode will be combined with the result of
 post-execution hooks, in order to allow administrators to enhance the
 cluster verification procedure.
@@ -430,7 +430,7 @@ cluster verification procedure.
 :directory: cluster-verify
 :env. vars: CLUSTER, MASTER, CLUSTER_TAGS, NODE_TAGS_<name>
 :pre-execution: none
-:post-execution: all nodes
+:post-execution: all nodes in a group
 
 OP_CLUSTER_RENAME
 +++++++++++++++++