diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 53272f68ea..de473a063d 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -159,6 +159,7 @@ list check out :doc:`plugin-commands`.
 * ``action definition``: (**Workflow Engine (Mistral)**)
 * ``action execution``: (**Workflow Engine (Mistral)**)
 * ``baremetal``: (**Baremetal (Ironic)**)
+* ``claim``: (**Messaging (Zaqar)**)
 * ``cluster``: (**Clustering (Senlin)**)
 * ``cluster action``: (**Clustering (Senlin)**)
 * ``cluster event``: (**Clustering (Senlin)**)
@@ -180,7 +181,8 @@ list check out :doc:`plugin-commands`.
 * ``dataprocessing image tags``: (**Data Processing (Sahara)**)
 * ``dataprocessing plugin``: (**Data Processing (Sahara)**)
 * ``message-broker cluster``: (**Message Broker (Cue)**)
-* ``message flavor``: (**Messaging (Zaqar)**)
+* ``messaging``: (**Messaging (Zaqar)**)
+* ``messaging flavor``: (**Messaging (Zaqar)**)
 * ``network subport``: (**Networking (Neutron)**)
 * ``network trunk``: (**Networking (Neutron)**)
 * ``orchestration resource``: (**Orchestration (Heat)**)
@@ -200,6 +202,7 @@ list check out :doc:`plugin-commands`.
 * ``stack resource``: (**Orchestration (Heat)**)
 * ``stack snapshot``: (**Orchestration (Heat)**)
 * ``stack template``: (**Orchestration (Heat)**)
+* ``subscription``: (**Messaging (Zaqar)**)
 * ``task execution``: (**Workflow Engine (Mistral)**)
 * ``tld``: (**DNS (Designate)**)
 * ``workbook``: (**Workflow Engine (Mistral)**)
diff --git a/doc/source/plugin-commands.rst b/doc/source/plugin-commands.rst
index 616d2f0f62..7428b34d01 100644
--- a/doc/source/plugin-commands.rst
+++ b/doc/source/plugin-commands.rst
@@ -105,5 +105,5 @@ senlin
 zaqar
 -----
 
-.. list-plugins:: openstack.messaging.v1
+.. list-plugins:: openstack.messaging.v2
    :detailed: