diff --git a/tools/pip-requires b/requirements.txt
similarity index 65%
rename from tools/pip-requires
rename to requirements.txt
index 2322ead3..6a508c1e 100644
--- a/tools/pip-requires
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+pbr>=0.5.22,!=0.5.23,<1.0
 pywin32
 wmi
 iso8601
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..1f95c5c1
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,31 @@
+[metadata]
+name = cloudbase-init
+version = 0.9.6
+summary = Portable cloud initialization service
+description-file =
+  README.rst
+author = Cloudbase Solutions Srl
+author-email = apilotti@cloudbasesolutions.com
+home-page = http://www.cloudbase.it/
+classifier =
+  Environment :: OpenStack
+  Intended Audience :: Information Technology
+  Intended Audience :: System Administrators
+  License :: OSI Approved :: Apache Software
+  License
+  Operating System :: OS Independent
+  Programming Language :: Python
+  Programming Language :: Python :: 2
+  Programming Language :: Python :: 2.7
+
+[files]
+packages =
+  cloudbaseinit
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
+[entry_points]
+console_scripts =
+  cloudbase-init = cloudbaseinit.shell:main
diff --git a/setup.py b/setup.py
index 3e0afb0b..4163c22d 100644
--- a/setup.py
+++ b/setup.py
@@ -16,32 +16,6 @@
 
 import setuptools
 
-from cloudbaseinit.openstack.common import setup as common_setup
-
-requires = common_setup.parse_requirements()
-dependency_links = common_setup.parse_dependency_links()
-
-setuptools.setup(name='cloudbase-init',
-                 version='0.9.5',
-                 description='Portable cloud initialization service',
-                 author='Cloudbase Solutions Srl',
-                 author_email='apilotti@cloudbasesolutions.com',
-                 url='http://www.cloudbase.it/',
-                 classifiers=['Environment :: OpenStack',
-                              'Intended Audience :: Information Technology',
-                              'Intended Audience :: System Administrators',
-                              'License :: OSI Approved :: Apache Software '
-                              'License',
-                              'Operating System :: OS Independent',
-                              'Programming Language :: Python',
-                              'Programming Language :: Python :: 2',
-                              'Programming Language :: Python :: 2.7'],
-                 cmdclass=common_setup.get_cmdclass(),
-                 packages=setuptools.find_packages(exclude=['bin']),
-                 install_requires=requires,
-                 dependency_links=dependency_links,
-                 include_package_data=True,
-                 setup_requires=['setuptools_git>=0.4'],
-                 entry_points={'console_scripts':
-                               ['cloudbase-init = cloudbaseinit.shell:main']},
-                 py_modules=[])
+setuptools.setup(
+    setup_requires=['pbr>=0.5.22,!=0.5.23'],
+    pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..03340308
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,5 @@
+hacking>=0.5.6,<0.8
+coverage>=3.6
+fixtures>=0.3.14
+mock>=1.0
+testtools>=0.9.32