diff --git a/.gitignore b/.gitignore
index e02ce3a..bd18a90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ debian/python-libraclient.postinst.debhelper
 debian/python-libraclient.prerm.debhelper
 debian/python-libraclient.substvars
 debian/python-libraclient/
+AUTHORS
+ChangeLog
diff --git a/setup.py b/setup.py
index 591678c..d4f7188 100644
--- a/setup.py
+++ b/setup.py
@@ -19,19 +19,11 @@ from openstack.common import setup
 requires = setup.parse_requirements()
 tests_requires = setup.parse_requirements(['tools/test-requires'])
 
-ci_cmdclass = {}
+ci_cmdclass = setup.get_cmdclass()
 
 try:
     from sphinx.setup_command import BuildDoc
 
-    class local_BuildDoc(BuildDoc):
-        def run(self):
-            builders = ['html', 'man']
-            for builder in builders:
-                self.builder = builder
-                self.finalize_options()
-                BuildDoc.run(self)
-
     class local_BuildDoc_latex(BuildDoc):
         def run(self):
             builders = ['latex']
@@ -40,13 +32,10 @@ try:
                 self.finalize_options()
                 BuildDoc.run(self)
 
-    ci_cmdclass['build_sphinx'] = local_BuildDoc
     ci_cmdclass['build_sphinx_latex'] = local_BuildDoc_latex
 except Exception:
     pass
 
-setup_reqs = ['Sphinx']
-
 execfile('libraclient/__init__.py')
 
 
@@ -64,5 +53,4 @@ setuptools.setup(
     cmdclass=ci_cmdclass,
     tests_require=tests_requires,
     install_requires=requires,
-    setup_requires=setup_reqs
 )
diff --git a/tools/test-requires b/tools/test-requires
index 473457d..8a222d0 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,5 +1,6 @@
 pep8
 mock
 httplib2
+sphinx>=1.1.2
 testrepository>=0.0.8
 testtools>=0.9.22