diff --git a/doc/source/cli/plugin-commands/aodh.rst b/doc/source/cli/plugin-commands/aodh.rst
new file mode 100644
index 000000000..5d8b4332c
--- /dev/null
+++ b/doc/source/cli/plugin-commands/aodh.rst
@@ -0,0 +1,4 @@
+aodh
+----
+
+.. autoprogram-cliff:: openstack.alarming.v2
diff --git a/doc/source/cli/plugin-commands/index.rst b/doc/source/cli/plugin-commands/index.rst
index e2e0dfa4d..eb607ff6c 100644
--- a/doc/source/cli/plugin-commands/index.rst
+++ b/doc/source/cli/plugin-commands/index.rst
@@ -7,6 +7,7 @@ Plugin Commands
 .. toctree::
    :maxdepth: 1
 
+   aodh
    barbican
    cyborg
    designate
@@ -29,10 +30,6 @@ Plugin Commands
 
 .. TODO(efried): Make pages for the following once they're fixed.
 
-.. aodh
-.. # aodhclient docs build is failing with recent pyparsing
-.. # autoprogram-cliff:: openstack.alarming.v2
-
 .. cue
 .. # cueclient is not in global-requirements
 .. # list-plugins:: openstack.mb.v1