diff --git a/requirements.txt b/requirements.txt
index ddee844f5e..0481dcc80d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
-d2to1>=0.2.10,<0.3
-pbr>=0.5,<0.6
+pbr>=0.5.21,<1.0
 
 argparse
 PyYAML
diff --git a/setup.cfg b/setup.cfg
index 242a2c365d..45f8e42d98 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,10 +19,6 @@ classifier =
 [pbr]
 warnerrors = True
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
     zuul-server = zuul.cmd.server:main
diff --git a/setup.py b/setup.py
index 59a00909ed..c0a24eab2a 100644
--- a/setup.py
+++ b/setup.py
@@ -17,5 +17,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1', 'pbr'],
-    d2to1=True)
+    setup_requires=['pbr'],
+    pbr=True)