diff --git a/doc/requirements.txt b/doc/requirements.txt
index f696fb1a..124143d7 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -10,5 +10,6 @@
 mock>=2.0.0 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
+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,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
diff --git a/releasenotes/source/queens.rst b/releasenotes/source/queens.rst
index 36ac6160..3e124383 100644
--- a/releasenotes/source/queens.rst
+++ b/releasenotes/source/queens.rst
@@ -1,6 +1,6 @@
-===================================
- Queens Series Release Notes
-===================================
+===========================
+Queens Series Release Notes
+===========================
 
 .. release-notes::
    :branch: stable/queens
diff --git a/releasenotes/source/stein.rst b/releasenotes/source/stein.rst
index efaceb66..6b7e7250 100644
--- a/releasenotes/source/stein.rst
+++ b/releasenotes/source/stein.rst
@@ -1,6 +1,6 @@
-===================================
- Stein Series Release Notes
-===================================
+==========================
+Stein Series Release Notes
+==========================
 
 .. release-notes::
    :branch: stable/stein