diff --git a/.gitignore b/.gitignore
index 9c2376107..cc07b09bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,7 @@
 dist
 *.qcow2
 *.raw
+build
+AUTHORS
+ChangeLog
+bin/diskimage_builder
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index daceefe75..52606d29d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,10 @@
-recursive-include lib
 include bin/disk-image-create
 include bin/disk-image-get-kernel
+include bin/element-info
 include bin/ramdisk-image-create
-recursive-include elements
+graft lib
+graft elements
+graft docs
+graft scripts
+graft sudoers.d
 include README.md
-recursive-include docs
diff --git a/setup.cfg b/setup.cfg
index 20daa6e62..bf9d4d186 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,37 @@
+[metadata]
+name = diskimage-builder
+version = 0.0.1
+summary = Golden Disk Image builder.
+description-file =
+    README.md
+author = HP Cloud Services
+author_email = openstack-dev@lists.openstack.org
+license: Apache License (2.0)
+home-page = https://github.com/stackforge/diskimage-builder
+classifier =
+    Development Status :: 3 - Alpha
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python :: 2.7
+    Environment :: Console
+
+[files]
+packages =
+    diskimage_builder
+scripts =
+    bin/disk-image-create
+    bin/disk-image-get-kernel
+    bin/element-info
+    bin/ramdisk-image-create
+data_files =
+    share/diskimage-builder/elements = elements/*
+    share/diskimage-builder/lib = lib/*
+    share/diskimage-builder/scripts = scripts/*
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
diff --git a/setup.py b/setup.py
index e31d822de..3e74fe081 100755
--- a/setup.py
+++ b/setup.py
@@ -15,29 +15,6 @@
 
 import setuptools
 
-with open("README.md", 'rt') as readme:
-    readme_text = readme.read()
-
 setuptools.setup(
-    name='diskimage_builder',
-    version='0.0.1',
-    description="""Build Disk Images for use on OpenStack Nova""",
-    long_description=readme_text,
-    license='Apache License (2.0)',
-    author='HP Cloud Services',
-    author_email='nobody@hp.com',
-    url='https://github.com/stackforge/diskimage-builder',
-    packages=setuptools.find_packages(),
-    include_package_data=True,
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2.7',
-        'Environment :: Console',
-    ],
-    scripts=['bin/disk-image-create',
-             'bin/disk-image-get-kernel',
-             'bin/element-info',
-             'bin/ramdisk-image-create'],
-    py_modules=[])
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
+    d2to1=True)