diff --git a/requirements.txt b/requirements.txt
index 0d4d86c64..fdc752691 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ netaddr
 oslo.config>=1.1.0
 Paste
 PasteDeploy>=1.5.0
-pbr>=0.5.16,<0.6
+pbr>=0.5.21,<1.0
 python-keystoneclient>=0.3.0
 Routes>=1.12.3
 SQLAlchemy>=0.7,<=0.7.99
diff --git a/setup.py b/setup.py
index 15f4e9d54..2a0786a8b 100755
--- a/setup.py
+++ b/setup.py
@@ -18,5 +18,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=0.5.20'],
+    setup_requires=['pbr>=0.5.21,<1.0'],
     pbr=True)