diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 36d1db78..62b34993 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,16 +1,16 @@
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in this page:
 
-   http://docs.openstack.org/infra/manual/developers.html
+   https://docs.openstack.org/infra/manual/developers.html
 
 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:
 
-   http://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
-Bugs should be filed on Launchpad, using a doc-tools tag:
+Bugs should be filed on Launchpad, using a theme tag:
 
-   https://bugs.launchpad.net/openstack-manuals
+   https://launchpad.net/openstack-doc-tools
diff --git a/HACKING.rst b/HACKING.rst
index 58a580b4..001343dc 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -2,11 +2,10 @@ OpenStack Docs Theme Style Commandments
 =======================================
 
 - Step 1: Read the OpenStack Style Commandments
-  http://docs.openstack.org/developer/hacking/
+  https://docs.openstack.org/developer/hacking/
 - Step 2: Read on
 
 Our Specific Commandments
 ---------------------------------
 
 Refer to https://wiki.openstack.org/wiki/Documentation/Conventions
-
diff --git a/README.rst b/README.rst
index 0aaec9d7..b3f5ce98 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================
 
-.. image:: http://governance.openstack.org/badges/openstackdocstheme.svg
-    :target: http://governance.openstack.org/reference/tags/index.html
+.. image:: https://governance.openstack.org/badges/openstackdocstheme.svg
+    :target: https://governance.openstack.org/reference/tags/index.html
 
 .. Change things from this point on
 
@@ -16,14 +16,14 @@ docs.openstack.org and developer.openstack.org.
 Intended for use by OpenStack `projects governed by the Technical Committee`_.
 
 .. _`projects governed by the Technical Committee`:
-http://governance.openstack.org/reference/projects/index.html
+https://governance.openstack.org/reference/projects/index.html
 
 Using the Theme
 ===============
 
 Prior to using this theme, ensure your project can use the OpenStack
 brand by referring to the brand guidelines at
-http://www.openstack.org/brand.
+https://www.openstack.org/brand.
 
 Update the requirements list for your project to
 include ``openstackdocstheme`` (usually in test-requirements.txt).
@@ -73,6 +73,6 @@ metadata for the project where the docs reside. You'll also need to add
 
 
 * Free software: Apache License, Version 2.0
-* Release notes: http://docs.openstack.org/releasenotes/openstackdocstheme/
-* Source: http://git.openstack.org/cgit/openstack/openstackdocstheme
-* Bugs: http://bugs.launchpad.net/openstack-manuals
+* Release notes: https://docs.openstack.org/releasenotes/openstackdocstheme/
+* Source: https://git.openstack.org/cgit/openstack/openstackdocstheme
+* Bugs: https://launchpad.net/openstack-doc-tools
diff --git a/index.rst b/index.rst
index 2a36cd31..a9b0b3c8 100644
--- a/index.rst
+++ b/index.rst
@@ -21,7 +21,7 @@ vncserver_listen = 0.0.0.0
 vncserver_proxyclient_address = 10.0.0.31
 novncproxy_base_url = http://controller:6080/vnc_auto.html
 
-..note:: Here's an example note. 
+..note:: Here's an example note.
 
 Developer Guide
 ===============