diff --git a/jeepyb/cmd/notify_impact.py b/jeepyb/cmd/notify_impact.py
index 0f81b1c..af1ad8a 100644
--- a/jeepyb/cmd/notify_impact.py
+++ b/jeepyb/cmd/notify_impact.py
@@ -85,8 +85,9 @@
     For non-documentation impacts at all states of merge
     notify the mailing list of impact.
     """
-    if args.impact.lower() == 'docimpact' and args.hook == "change-merged":
-        create_bug(git_log, args, 'openstack-manuals')
+    if args.impact.lower() == 'docimpact':
+        if args.hook == "change-merged":
+            create_bug(git_log, args, 'openstack-manuals')
         return
 
     email_content = EMAIL_TEMPLATE % (args.impact,
diff --git a/setup.cfg b/setup.cfg
index 4673363..7f0114a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,10 +16,6 @@
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 2.6
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
     close-pull-requests = jeepyb.cmd.close_pull_requests:main
diff --git a/setup.py b/setup.py
index 59a0090..c0a24ea 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)