diff --git a/setup.cfg b/setup.cfg
index fb944b6..ae4f243 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,8 +22,6 @@ packages =
 namespace_packages =
     oslo
 
-[entry_points]
-distutils.setup_keywords = 
-	oslo_packaging = oslo.packaging.core:setup
-oslo.packaging.attr_filters =
-        oslo_packaging = oslo.packaging.packaging:attr_filter
+[global]
+setup-hooks =
+    oslo.packaging.hooks.setup_hook
diff --git a/setup.py b/setup.py
index 5cd6208..59ea051 100755
--- a/setup.py
+++ b/setup.py
@@ -16,10 +16,6 @@
 
 import setuptools
 
-# See setup.cfg for the project metadata.
-from oslo.packaging import util
-
-
-# Use our internals directly, so that we don't chicken-and-egg needing to
-# install an entry point before using ourself.
-setuptools.setup(**util.filtered_args())
+setuptools.setup(
+    setup_requires = ['d2to1'],
+    d2to1 = True)