diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4cfe3602a..e9f0661e8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -93,9 +93,6 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ['nova-specs.']
 
-# -- Options for man page output ----------------------------------------------
-#man_pages = []
-
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
diff --git a/requirements.txt b/requirements.txt
index 3615e650e..7f69b369c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
+
 oslosphinx>=4.7.0 # Apache-2.0
-pbr>=1.8 # Apache-2.0
 sphinx>=1.5.1 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
diff --git a/setup.cfg b/setup.cfg
index 2cd3e3964..ef197bfad 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,6 +12,7 @@ classifier =
     Operating System :: POSIX :: Linux
 
 [build_sphinx]
+builders = html
 all_files = 1
 build-dir = doc/build
 source-dir = doc/source
diff --git a/setup.py b/setup.py
index 782bb21f0..3887303fb 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.8'],
+    setup_requires=['pbr>=2.0'],
     pbr=True)