diff --git a/README.rst b/README.rst
index f0b6a7f1a..e9ef3738e 100644
--- a/README.rst
+++ b/README.rst
@@ -21,4 +21,4 @@ migration, increased energy efficiency-and more!
 * Wiki: http://wiki.openstack.org/wiki/Watcher
 * Source:  https://github.com/openstack/watcher
 * Bugs: http://bugs.launchpad.net/watcher
-* Documentation: https://factory.b-com.com/www/watcher/doc/watcher/index.html
+* Documentation: http://docs.openstack.org/developer/watcher/
diff --git a/doc/source/deploy/user-guide.rst b/doc/source/deploy/user-guide.rst
index 367b57974..2245d6d9b 100644
--- a/doc/source/deploy/user-guide.rst
+++ b/doc/source/deploy/user-guide.rst
@@ -11,7 +11,7 @@ Watcher User Guide
 ==================
 
 See the
-`architecture page <https://factory.b-com.com/www/watcher/doc/watcher/architecture.html>`_
+`architecture page <http://docs.openstack.org/developer/watcher/architecture.html>`_
 for an architectural overview of the different components of Watcher and how
 they fit together.
 
diff --git a/doc/source/dev/environment.rst b/doc/source/dev/environment.rst
index 14e8fbbcd..c4bf7aff5 100644
--- a/doc/source/dev/environment.rst
+++ b/doc/source/dev/environment.rst
@@ -17,7 +17,7 @@ To install Watcher from packaging, refer instead to Watcher `User
 Documentation`_.
 
 .. _`Git Repository`: http://git.openstack.org/cgit/openstack/watcher
-.. _`User Documentation`: https://factory.b-com.com/www/watcher/doc/watcher/
+.. _`User Documentation`: http://docs.openstack.org/developer/watcher/
 
 Prerequisites
 =============