diff --git a/doc/config-reference/object-storage/section_configure_s3.xml b/doc/config-reference/object-storage/section_configure_s3.xml
index 37fc854206..9630d98924 100644
--- a/doc/config-reference/object-storage/section_configure_s3.xml
+++ b/doc/config-reference/object-storage/section_configure_s3.xml
@@ -40,7 +40,7 @@
     <para>To use this middleware, first download the latest
         version from its repository to your proxy
         server(s).</para>
-    <screen><prompt>$</prompt> <userinput>git clone https://git.openstack.org/stackforge/swift3</userinput></screen>
+    <screen><prompt>$</prompt> <userinput>git clone https://git.openstack.org/openstack/swift3</userinput></screen>
     <para>Then, install it using standard python mechanisms, such
         as:</para>
     <screen><prompt>#</prompt> <userinput>python setup.py install</userinput></screen>
diff --git a/doc/contributor-guide/source/docs_builds.rst b/doc/contributor-guide/source/docs_builds.rst
index 8914715469..b6fb2ba44b 100644
--- a/doc/contributor-guide/source/docs_builds.rst
+++ b/doc/contributor-guide/source/docs_builds.rst
@@ -248,7 +248,7 @@ To build with the latest SNAPSHOT version of the plug-in, do the following:
 
 #. Clone the clouddocs-maven-plugin::
 
-    git clone https://git.openstack.org/stackforge/clouddocs-maven-plugin
+    git clone https://git.openstack.org/openstack/clouddocs-maven-plugin
 
 #. Open the repository::
 
diff --git a/doc/contributor-guide/source/tools_and_content_overview.rst b/doc/contributor-guide/source/tools_and_content_overview.rst
index 2b22a8804b..bf471d9719 100644
--- a/doc/contributor-guide/source/tools_and_content_overview.rst
+++ b/doc/contributor-guide/source/tools_and_content_overview.rst
@@ -129,7 +129,7 @@ Maven plugin
 ------------
 
 The Cloud Doc Tools Maven plug-in provides a build tool that Jenkins can use
-to build PDF and HTML from DocBook and WADL source files. It is maintained at http://git.openstack.org/cgit/stackforge/clouddocs-maven-plugin/tree/. We
+to build PDF and HTML from DocBook and WADL source files. It is maintained at http://git.openstack.org/cgit/openstack/clouddocs-maven-plugin/tree/. We
 track bugs against the output in the openstack-manuals Launchpad project.
 
 The release notes are available in the Git repository.