diff --git a/README.rst b/README.rst
index f651f2205f..cd38881d47 100644
--- a/README.rst
+++ b/README.rst
@@ -11,7 +11,7 @@ To tame it for use in your own cloud: read http://docs.openstack.org
 
 To study its anatomy: read https://wiki.openstack.org/wiki/Manila
 
-To dissect it in detail: visit http://github.com/stackforge/manila
+To dissect it in detail: visit http://github.com/openstack/manila
 
 To taunt it with its weaknesses: use http://bugs.launchpad.net/manila
 
diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst
index 0862ae754d..aa218d4c94 100644
--- a/doc/source/devref/development.environment.rst
+++ b/doc/source/devref/development.environment.rst
@@ -89,7 +89,7 @@ Getting the code
 ----------------
 Grab the code from GitHub::
 
-    git clone https://github.com/stackforge/manila.git
+    git clone https://github.com/openstack/manila.git
     cd manila