diff --git a/requirements.txt b/doc/requirements.txt
similarity index 100%
rename from requirements.txt
rename to doc/requirements.txt
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 38a9891..6809917 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -8,6 +8,7 @@
 ==============================
 
 Contents:
+=========
 
 .. toctree::
    :maxdepth: 2
@@ -33,8 +34,8 @@ Contents:
    ptl
    glossary
 
-====================
- Indices and tables
-====================
+
+Indices and tables
+==================
 
 * :ref:`search`
diff --git a/setup.cfg b/setup.cfg
index 2e55e94..80cb8ac 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,20 +5,12 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page = https://docs.openstack.org/project-team-guide/
 classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
-[pbr]
-warnerrors = True
 
 [wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index aacefbe..d4e5595 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,10 +7,11 @@ skipsdist = True
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
 install_command = pip install -U {opts} {packages}
-deps = -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/doc/requirements.txt
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html