diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 647cd29..7aebd03 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,17 +1,17 @@
 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
 
 If you already have a good understanding of how the system works and your
 OpenStack accounts are set up, you can skip to the development workflow
 section of this documentation to learn how changes to OpenStack should be
 submitted for review via the Gerrit tool:
 
-   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, not GitHub:
 
-   https://bugs.launchpad.net/python-aodhclient
+   https://storyboard.openstack.org/#!/project/openstack/python-aodhclient
diff --git a/README.rst b/README.rst
index bcc3978..cfed0ed 100644
--- a/README.rst
+++ b/README.rst
@@ -14,4 +14,4 @@ as aodh). Each implements the entire OpenStack Aodh API.
 * Release notes: https://releases.openstack.org/teams/telemetry.html
 * Documentation: https://docs.openstack.org/python-aodhclient/latest/
 * Source: https://opendev.org/openstack/python-aodhclient
-* Bugs: https://bugs.launchpad.net/python-aodhclient
+* Bugs: https://storyboard.openstack.org/#!/project/openstack/python-aodhclient
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 00f4f5b..047e5bc 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,2 +1,7 @@
-sphinx>=1.6.2 # BSD
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
 openstackdocstheme>=1.11.0 # Apache-2.0