diff --git a/firstapp/README.rst b/firstapp/README.rst
index 09515f74b..22ba249a3 100644
--- a/firstapp/README.rst
+++ b/firstapp/README.rst
@@ -5,8 +5,9 @@ Writing Your First OpenStack Application
 This directory contains the "Writing Your First OpenStack Application"
 tutorial.
 
-The tutorials work with an application that can be found at
-`https://github.com/stackforge/faafo <https://github.com/stackforge/faafo/>`_.
+The tutorials work with an application that can be found in the
+`openstack/faafo <http://git.openstack.org/cgit/openstack/faafo>`_
+repository.
 
 Prerequisites
 -------------
diff --git a/firstapp/samples/libcloud/getting_started.py b/firstapp/samples/libcloud/getting_started.py
index 786ee56d6..3f2f329aa 100755
--- a/firstapp/samples/libcloud/getting_started.py
+++ b/firstapp/samples/libcloud/getting_started.py
@@ -88,7 +88,7 @@ for security_group in conn.ex_list_security_groups():
 
 # step-11
 userdata = '''#!/usr/bin/env bash
-curl -L -s https://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i faafo -i messaging -r api -r worker -r demo
 '''
 
diff --git a/firstapp/samples/libcloud/introduction.py b/firstapp/samples/libcloud/introduction.py
index c3e81c47e..62d7d8c71 100644
--- a/firstapp/samples/libcloud/introduction.py
+++ b/firstapp/samples/libcloud/introduction.py
@@ -1,6 +1,6 @@
 # step-1
 userdata = '''#!/usr/bin/env bash
-curl -L -s https://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i faafo -i messaging -r api -r worker -r demo
 '''
 
@@ -14,7 +14,7 @@ testing_instance = conn.create_node(name=instance_name,
 
 # step-2
 userdata = '''#!/usr/bin/env bash
-curl -L -s https://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i messaging -i faafo -r api -r worker -r demo
 '''
 
@@ -60,7 +60,7 @@ conn.ex_create_security_group_rule(controller_group, 'TCP', 80, 80)
 conn.ex_create_security_group_rule(controller_group, 'TCP', 5672, 5672, source_security_group=worker_group)
 
 userdata = '''#!/usr/bin/env bash
-curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i messaging -i faafo -r api
 '''
 
@@ -97,7 +97,7 @@ else:
     ip_controller = instance_controller_1.public_ips[0]
 
 userdata = '''#!/usr/bin/env bash
-curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i faafo -r worker -e 'http://%(ip_controller)s' -m 'amqp://guest:guest@%(ip_controller)s:5672/'
 ''' % {'ip_controller': ip_controller}
 instance_worker_1 = conn.create_node(name='app-worker-1',
diff --git a/firstapp/samples/libcloud/scaling_out.py b/firstapp/samples/libcloud/scaling_out.py
index cee60bc65..708c8f57f 100644
--- a/firstapp/samples/libcloud/scaling_out.py
+++ b/firstapp/samples/libcloud/scaling_out.py
@@ -44,7 +44,7 @@ def get_floating_ip(conn):
 
 # step-4
 userdata = '''#!/usr/bin/env bash
-curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i database -i messaging
 '''
 
@@ -60,7 +60,7 @@ services_ip = instance_services.private_ips[0]
 
 # step-5
 userdata = '''#!/usr/bin/env bash
-curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i faafo -r api -m 'amqp://guest:guest@%(services_ip)s:5672/' \
     -d 'mysql+pymysql://faafo:password@%(services_ip)s:3306/faafo'
 ''' % { 'services_ip': services_ip }
@@ -88,7 +88,7 @@ for instance in [instance_api_1,  instance_api_2]:
 
 # step-6
 userdata = '''#!/usr/bin/env bash
-curl -L -s http://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s http://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
     -i faafo -r worker -e 'http://%(api_1_ip)s' -m 'amqp://guest:guest@%(services_ip)s:5672/'
 ''' % {'api_1_ip': api_1_ip, 'services_ip': services_ip}
 instance_worker_1 = conn.create_node(name='app-worker-1',
diff --git a/firstapp/samples/pkgcloud/getting_started.js b/firstapp/samples/pkgcloud/getting_started.js
index e82614932..1548ecf11 100644
--- a/firstapp/samples/pkgcloud/getting_started.js
+++ b/firstapp/samples/pkgcloud/getting_started.js
@@ -140,7 +140,7 @@ if (security_group_exists) {
 
 // step-11
 userdata = "#!/usr/bin/env bash\n" +
-    "curl -L -s https://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh" +
+    "curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh" +
     " | bash -s -- -i faafo -i messaging -r api -r worker -r demo";
 userdata = new Buffer(userdata).toString('base64')
 
diff --git a/firstapp/samples/shade/getting_started.py b/firstapp/samples/shade/getting_started.py
index 8763e0cb6..5b0a5efae 100644
--- a/firstapp/samples/shade/getting_started.py
+++ b/firstapp/samples/shade/getting_started.py
@@ -70,7 +70,7 @@ conn.search_security_groups(sec_group_name)
 #step-11
 ex_userdata = '''#!/usr/bin/env bash
 
-curl -L -s https://git.openstack.org/cgit/stackforge/faafo/plain/contrib/install.sh | bash -s -- \
+curl -L -s https://git.openstack.org/cgit/openstack/faafo/plain/contrib/install.sh | bash -s -- \
 -i faafo -i messaging -r api -r worker -r demo
 '''
 
diff --git a/firstapp/source/getting_started.rst b/firstapp/source/getting_started.rst
index a80145f28..dcd6f0924 100644
--- a/firstapp/source/getting_started.rst
+++ b/firstapp/source/getting_started.rst
@@ -55,8 +55,8 @@ Language        Name          Description
 ============== ============= ================================================================= ====================================================
 Python         Libcloud      A Python-based library managed by the Apache Foundation.
                              This library enables you to work with multiple types of clouds.   https://libcloud.apache.org
-Python         OpenStack SDK A Python-based library specifically developed for OpenStack.      https://github.com/stackforge/python-openstacksdk
-Python         Shade         A Python-based library developed by OpenStack Infra team to       https://github.com/openstack-infra/shade
+Python         OpenStack SDK A Python-based library specifically developed for OpenStack.      http://git.openstack.org/cgit/openstack/python-openstacksdk
+Python         Shade         A Python-based library developed by OpenStack Infra team to       http://git.openstack.org/cgit/openstack-infra/shade
                              operate multiple OpenStack clouds.
 Java           jClouds       A Java-based library. Like Libcloud, it's also managed by the     https://jclouds.apache.org
                              Apache Foundation and works with multiple types of clouds.