diff --git a/openstack/Tempest/Tempest.spec.j2 b/openstack/Tempest/Tempest.spec.j2
index 3a365232e..7e14a2d27 100644
--- a/openstack/Tempest/Tempest.spec.j2
+++ b/openstack/Tempest/Tempest.spec.j2
@@ -18,7 +18,6 @@ BuildRequires:  {{ py2pkg('fixtures') }}
 BuildRequires:  {{ py2pkg('jsonschema') }}
 BuildRequires:  {{ py2pkg('mock') }}
 BuildRequires:  {{ py2pkg('netaddr') }}
-BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('os-testr') }}
 BuildRequires:  {{ py2pkg('oslo.concurrency') }}
 BuildRequires:  {{ py2pkg('oslo.config') }}
@@ -67,7 +66,7 @@ deployment.
 %package doc
 Summary:        Documentation for the OpenStack Integration Test Suite
 BuildRequires:  {{ py2pkg('Sphinx') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
+BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 
 %description doc
 Documentation for the OpenStack Integration Test Suite.
diff --git a/openstack/aodhclient/aodhclient.spec.j2 b/openstack/aodhclient/aodhclient.spec.j2
index e8dae1d47..291fa3fd8 100644
--- a/openstack/aodhclient/aodhclient.spec.j2
+++ b/openstack/aodhclient/aodhclient.spec.j2
@@ -10,7 +10,6 @@ Source0:        https://files.pythonhosted.org/packages/source/a/%{sname}/%{snam
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('cliff') }}
 BuildRequires:  {{ py2pkg('keystoneauth1') }}
-BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('oslo.serialization') }}
 BuildRequires:  {{ py2pkg('oslo.utils') }}
 BuildRequires:  {{ py2pkg('oslotest') }}
@@ -41,7 +40,7 @@ provides a Python API (the aodhclient module) and a command-line tool.
 Summary:        Documentation for OpenStack Aodh API Client
 Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
+BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 
 %description      doc
 This is a client library for Aodh built on the Aodh API. It
diff --git a/openstack/automaton/automaton.spec.j2 b/openstack/automaton/automaton.spec.j2
index 672ecf5f2..f2c8b4eb9 100644
--- a/openstack/automaton/automaton.spec.j2
+++ b/openstack/automaton/automaton.spec.j2
@@ -14,7 +14,6 @@ Source0:        {{ source }}
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('devel', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('PrettyTable', py_versions=['py2', 'py3']) }}
-BuildRequires:  {{ py2pkg('oslosphinx', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('stestr', py_versions=['py2', 'py3']) }}
diff --git a/openstack/networking-generic-switch/networking-generic-switch.spec.j2 b/openstack/networking-generic-switch/networking-generic-switch.spec.j2
index 5687e5c22..7a1ae1250 100644
--- a/openstack/networking-generic-switch/networking-generic-switch.spec.j2
+++ b/openstack/networking-generic-switch/networking-generic-switch.spec.j2
@@ -20,7 +20,6 @@ BuildRequires:  {{ py2pkg('oslo.db') }}
 BuildRequires:  {{ py2pkg('oslo.i18n') }}
 BuildRequires:  {{ py2pkg('oslo.log') }}
 BuildRequires:  {{ py2pkg('oslo.middleware') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 BuildRequires:  {{ py2pkg('oslotest') }}
 BuildRequires:  {{ py2pkg('six') }}
 BuildRequires:  {{ py2pkg('stestr') }}
@@ -55,8 +54,7 @@ and handling ``local_link_information`` field of Neutron port.
 Summary:        Generic Switch ML2 Neutron Driver Doc
 Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
-BuildRequires:  {{ py2pkg('openstackdocstheme') }}
-BuildRequires:  {{ py2pkg('reno') }}
+BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description doc
 Documentation for OpenStack Generic Switch ML2 Neutron Driver.
diff --git a/openstack/neutron/neutron.spec.j2 b/openstack/neutron/neutron.spec.j2
index 530353d46..3e717e964 100644
--- a/openstack/neutron/neutron.spec.j2
+++ b/openstack/neutron/neutron.spec.j2
@@ -235,7 +235,6 @@ Summary:        Documentation for OpenStack Networking Service
 Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description doc
 OpenStack Neutron documentaion.
diff --git a/openstack/nova/nova.spec.j2 b/openstack/nova/nova.spec.j2
index 11f26d066..6fe5ab4e7 100644
--- a/openstack/nova/nova.spec.j2
+++ b/openstack/nova/nova.spec.j2
@@ -445,7 +445,6 @@ BuildRequires:  {{ py2pkg('lxml') }}
 BuildRequires:  {{ py2pkg('netifaces') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('os-resource-classes') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 BuildRequires:  {{ py2pkg('paramiko') }}
 BuildRequires:  {{ py2pkg('psutil') }}
 BuildRequires:  {{ py2pkg('python-memcached') }}
diff --git a/openstack/os-win/os-win.spec.j2 b/openstack/os-win/os-win.spec.j2
index 33f455059..ab553a99c 100644
--- a/openstack/os-win/os-win.spec.j2
+++ b/openstack/os-win/os-win.spec.j2
@@ -20,7 +20,6 @@ BuildRequires:  {{ py2pkg('mock', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('oslo.concurrency', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('oslo.i18n', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('oslo.log', py_versions=['py2', 'py3']) }}
-BuildRequires:  {{ py2pkg('oslosphinx', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('oslotest', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('pbr', py_versions=['py2', 'py3']) }}
 BuildRequires:  {{ py2pkg('testrepository', py_versions=['py2', 'py3']) }}
diff --git a/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2 b/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
index bf1f3430f..b43bb4774 100644
--- a/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
+++ b/openstack/oslo.upgradecheck/oslo.upgradecheck.spec.j2
@@ -49,7 +49,6 @@ integrating that code into a project.
 Summary:        Common code for writing OpenStack upgrade checks
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description -n python-{{ pypi_name }}-doc
 Documentation for the {{ pypi_name }} library.
diff --git a/openstack/python-masakariclient/python-masakariclient.spec.j2 b/openstack/python-masakariclient/python-masakariclient.spec.j2
index 5b3891a57..da1431c9b 100644
--- a/openstack/python-masakariclient/python-masakariclient.spec.j2
+++ b/openstack/python-masakariclient/python-masakariclient.spec.j2
@@ -15,7 +15,6 @@ BuildRequires:  {{ py2pkg('openstacksdk') }}
 BuildRequires:  {{ py2pkg('osc-lib') }}
 BuildRequires:  {{ py2pkg('oslo.serialization') }}
 BuildRequires:  {{ py2pkg('oslo.utils') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 BuildRequires:  {{ py2pkg('oslotest') }}
 BuildRequires:  {{ py2pkg('python-subunit') }}
 BuildRequires:  {{ py2pkg('reno') }}
diff --git a/openstack/python-swiftclient/python-swiftclient.spec.j2 b/openstack/python-swiftclient/python-swiftclient.spec.j2
index 58fe45c58..2fda2d4e3 100644
--- a/openstack/python-swiftclient/python-swiftclient.spec.j2
+++ b/openstack/python-swiftclient/python-swiftclient.spec.j2
@@ -44,7 +44,6 @@ Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('futures') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 Requires:       %{name} = %{version}
 
 %description -n python-swiftclient-doc
diff --git a/openstack/python-tripleoclient/python-tripleoclient.spec.j2 b/openstack/python-tripleoclient/python-tripleoclient.spec.j2
index d24505f66..8ed4148b9 100644
--- a/openstack/python-tripleoclient/python-tripleoclient.spec.j2
+++ b/openstack/python-tripleoclient/python-tripleoclient.spec.j2
@@ -56,7 +56,6 @@ Summary:        Documentation for OpenstackClient plugin for tripleoclient
 Group:          Documentation/HTML
 BuildRequires:  {{ py2pkg('Sphinx') }}
 BuildRequires:  {{ py2pkg('openstackdocstheme') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description      doc
 python-tripleoclient is a Python plugin to OpenstackClient
diff --git a/openstack/python-troveclient/python-troveclient.spec.j2 b/openstack/python-troveclient/python-troveclient.spec.j2
index 2b29ff15f..05925aaf6 100644
--- a/openstack/python-troveclient/python-troveclient.spec.j2
+++ b/openstack/python-troveclient/python-troveclient.spec.j2
@@ -14,7 +14,6 @@ BuildRequires:  {{ py2pkg('keystoneauth1') }}
 BuildRequires:  {{ py2pkg('python-mistralclient') }}
 BuildRequires:  {{ py2pkg('mock') }}
 BuildRequires:  {{ py2pkg('oslo.utils') }}
-BuildRequires:  {{ py2pkg('oslosphinx') }}
 BuildRequires:  {{ py2pkg('pbr') }}
 BuildRequires:  {{ py2pkg('requests') }}
 BuildRequires:  {{ py2pkg('requests-mock') }}
diff --git a/openstack/vmware-nsx/vmware-nsx.spec.j2 b/openstack/vmware-nsx/vmware-nsx.spec.j2
index 8fd6aa931..e7ba7e1b3 100644
--- a/openstack/vmware-nsx/vmware-nsx.spec.j2
+++ b/openstack/vmware-nsx/vmware-nsx.spec.j2
@@ -62,7 +62,6 @@ Summary:        Documentation for vmware-nsx
 Group:          Documentation/HTML
 BuildRequires:  fdupes
 BuildRequires:  {{ py2pkg('Sphinx') }}
-BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description -n python-vmware-nsx-doc
diff --git a/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2 b/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
index 817b061c6..22d3e4e4f 100644
--- a/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
+++ b/openstack/vmware-nsxlib/vmware-nsxlib.spec.j2
@@ -49,7 +49,6 @@ Summary:        Documentation for vmware-nsxlib
 Group:          Documentation/HTML
 BuildRequires:  fdupes
 BuildRequires:  {{ py2pkg('Sphinx') }}
-BuildRequires:  {{ py2pkg('openstackdocstheme') }}
 BuildRequires:  {{ py2pkg('oslosphinx') }}
 
 %description -n python-vmware-nsxlib-doc