diff --git a/setup.cfg b/setup.cfg
index b3535da..8ffa7b4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,11 +1,11 @@
 [metadata]
 name = glean
 summary = Simple program to write static config from config-drive
-description-file =
+description_file =
     README.rst
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = http://www.openstack.org/
+author_email = openstack-discuss@lists.openstack.org
+home_page = https://www.openstack.org/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -23,11 +23,3 @@ classifier =
 console_scripts =
     glean = glean.cmd:main
     glean-install = glean.install:main
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/tox.ini b/tox.ini
index c9ac642..d7fab51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+commands = sphinx-build -b html doc/source doc/build/html
 
 [flake8]
 show-source = True