diff --git a/HACKING.rst b/HACKING.rst
index 19d21ae6..3a8b8720 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -62,7 +62,7 @@ The testing system is based on a combination of tox and testr. If you just
 want to run the whole suite, run `tox` and all will be fine. However, if
 you'd like to dig in a bit more, you might want to learn some things about
 testr itself. A basic walkthrough for OpenStack can be found at
-http://wiki.openstack.org/testr
+https://wiki.openstack.org/wiki/Testr
 
 OpenStack Trademark
 -------------------
@@ -98,4 +98,4 @@ For further information on constructing high quality commit messages,
 and how to split up commits into a series of changes, consult the
 project wiki:
 
-   http://wiki.openstack.org/GitCommitMessages
+   https://wiki.openstack.org/wiki/GitCommitMessages
diff --git a/README.rst b/README.rst
index 60b5b4d3..8d0a5df1 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================
 
-.. image:: http://governance.openstack.org/badges/cloudkitty.svg
-    :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/tc/badges/cloudkitty.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
 
 .. Change things from this point on
 
@@ -87,11 +87,11 @@ want to install it on an older system, use a virtualenv.
 
 .. |doc-status|
    image:: https://readthedocs.org/projects/cloudkitty/badge/?version=latest
-   :target: http://cloudkitty.readthedocs.org
+   :target: http://cloudkitty.readthedocs.io/en/latest/
    :alt: Documentation Status
 
 
-.. _readthedocs: http://cloudkitty.readthedocs.org
+.. _readthedocs: http://cloudkitty.readthedocs.io/en/latest/
 
 
 .. _storyboard: https://storyboard.openstack.org/#!/project/890
@@ -103,10 +103,10 @@ want to install it on an older system, use a virtualenv.
 .. _cloudkitty-dashboard: https://github.com/openstack/cloudkitty-dashboard
 
 
-.. _architecture section: https://cloudkitty.readthedocs.org/en/latest/arch.html
+.. _architecture section: https://cloudkitty.readthedocs.io/en/latest/arch.html
 
 
-.. _devstack section: https://cloudkitty.readthedocs.org/en/latest/devstack.html
+.. _devstack section: https://cloudkitty.readthedocs.io/en/latest/devstack.html
 
 
-.. _installation section: https://cloudkitty.readthedocs.org/en/latest/installation.html
+.. _installation section: https://cloudkitty.readthedocs.io/en/latest/installation.html