diff --git a/doc/requirements.txt b/doc/requirements.txt
index 12ed5f01a..d603c1d4b 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -27,5 +27,6 @@ python-saharaclient>=1.4.0 # Apache-2.0
 python-searchlightclient>=1.0.0 #Apache-2.0
 python-senlinclient>=1.1.0 # Apache-2.0
 python-troveclient>=2.2.0 # Apache-2.0
+python-watcherclient>=2.4.0 # Apache-2.0
 python-zaqarclient>=1.0.0 # Apache-2.0
 python-zunclient>=3.4.0 # Apache-2.0
diff --git a/doc/source/cli/plugin-commands/index.rst b/doc/source/cli/plugin-commands/index.rst
index f6ff51bd6..2c3bda3e0 100644
--- a/doc/source/cli/plugin-commands/index.rst
+++ b/doc/source/cli/plugin-commands/index.rst
@@ -25,6 +25,7 @@ Plugin Commands
    searchlight
    senlin
    trove
+   watcher
    zaqar
    zun
 
@@ -44,8 +45,3 @@ Plugin Commands
 .. # tripleoclient is not in global-requirements
 .. # list-plugins:: openstack.tripleoclient.v1
 .. #   :detailed:
-
-.. watcher
-.. # watcherclient is not in global-requirements
-.. # list-plugins:: openstack.infra_optim.v1
-.. #  :detailed:
diff --git a/doc/source/cli/plugin-commands/watcher.rst b/doc/source/cli/plugin-commands/watcher.rst
new file mode 100644
index 000000000..7f9afbdc2
--- /dev/null
+++ b/doc/source/cli/plugin-commands/watcher.rst
@@ -0,0 +1,7 @@
+watcher
+-------
+
+.. TODO(efried): cut over to autoprogram-cliff once doc build is fixed
+
+.. list-plugins:: openstack.infra_optim.v1
+   :detailed:
diff --git a/lower-constraints.txt b/lower-constraints.txt
index db0562e12..6533edafc 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -109,6 +109,7 @@ python-senlinclient==1.1.0
 python-subunit==1.0.0
 python-swiftclient==3.2.0
 python-troveclient==2.2.0
+python-watcherclient==2.4.0
 python-zaqarclient==1.0.0
 python-zunclient==3.4.0
 pytz==2013.6