diff --git a/setup.cfg b/setup.cfg
index faa79adf..8ff3761c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,10 +1,10 @@
 [metadata]
 name = tripleo-docs
-summary = tripleo-docs
+summary = TripleO documentation
 description-file =
     README.md
-author = James Slagle
-author-email = jslagle@redhat.com
+author = OpenStack
+author-email = openstack-dev@lists.openstack.org
 home-page = http://docs.openstack.org/tripleo-docs
 classifier =
     Environment :: OpenStack
@@ -18,3 +18,19 @@ classifier =
     Programming Language :: Python :: 2.6
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
+
+[egg_info]
+tag_build =
+tag_date = 0
+tag_svn_revision = 0
+
+[wheel]
+universal = 1
+
+[pbr]
+warnerrors = False
diff --git a/tox.ini b/tox.ini
index 2a8e4014..3e93e128 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
 commands = {posargs}
 
 [testenv:docs]
-commands = sphinx-build -a doc/source/ build/sphinx/html
+commands = python setup.py build_sphinx
 
 [testenv:pep8]
 whitelist_externals = bash