diff --git a/README.rst b/README.rst
index 7f0aa053..612156c9 100644
--- a/README.rst
+++ b/README.rst
@@ -6,7 +6,7 @@ Portable Multi-Cloud Initialization Service
 * Home page:      http://www.cloudbase.it/cloud-init-windows/
 
 * Documentation:  http://cloudbase-init.readthedocs.org/en/latest/
-* Source:         https://github.com/stackforge/cloudbase-init
+* Source:         https://github.com/openstack/cloudbase-init
 * License:        Apache 2.0
 
 
diff --git a/doc/source/intro.rst b/doc/source/intro.rst
index ea7a8239..2e26f98d 100644
--- a/doc/source/intro.rst
+++ b/doc/source/intro.rst
@@ -3,7 +3,7 @@
 Intro
 =====
 
-The open source `project <https://github.com/stackforge/cloudbase-init>`_
+The open source `project <https://github.com/openstack/cloudbase-init>`_
 **cloudbase-init** is a service conceived and
 maintained by Cloudbase Solutions Srl, currently working on NT systems.
 It was designed to initialize and configure guest operating systems under