diff --git a/HACKING.rst b/HACKING.rst
index ac363673e..49eba1184 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,7 +2,7 @@ Nova Client Style Commandments
 ==============================
 
 - Step 1: Read the OpenStack Style Commandments
-  https://github.com/openstack-dev/hacking/blob/master/HACKING.rst
+  http://docs.openstack.org/developer/hacking
 - Step 2: Read on
 
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index a9b617abf..00d1a81ea 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -30,11 +30,11 @@ Contents:
 Contributing
 ============
 
-Code is hosted `on GitHub`_. Submit bugs to the Nova project on 
+Code is hosted at `git.openstack.org`_. Submit bugs to the Nova project on
 `Launchpad`_. Submit code to the openstack/python-novaclient project using
 `Gerrit`_.
 
-.. _on GitHub: https://github.com/openstack/python-novaclient
+.. _git.openstack.org: https://git.openstack.org/cgit/openstack/python-novaclient
 .. _Launchpad: https://launchpad.net/nova
 .. _Gerrit: http://wiki.openstack.org/GerritWorkflow
 
diff --git a/setup.cfg b/setup.cfg
index 0f5f94fb4..6fc426cdc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description-file =
 license = Apache License, Version 2.0
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = https://github.com/openstack/python-novaclient
+home-page = https://git.openstack.org/cgit/openstack/python-novaclient
 classifier =
     Development Status :: 5 - Production/Stable
     Environment :: Console