diff --git a/.gitignore b/.gitignore
index c66683a36..1709df558 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 *.egg-info
 dist
 *.qcow2
+build
+AUTHORS
+ChangeLog
diff --git a/MANIFEST.in b/MANIFEST.in
index 15fc5d253..9e65a96c5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-recursive-include elements
 include README.md
-recursive-include docs
+graft elements
+graft docs
diff --git a/setup.cfg b/setup.cfg
index 20daa6e62..3507f5124 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,13 +1,24 @@
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = diskimage_builder/locale/diskimage_builder.pot
+[metadata]
+name = tripleo-image-elements
+version = 0.0.1
+summary = Disk image builder elements for deploying OpenStack.
+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/tripleo-image-elements
+classifier =
+    Development Status :: 3 - Alpha
+    License :: OSI Approved :: Apache Software License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Other
+    Environment :: Console
 
-[update_catalog]
-domain = diskimage_builder
-output_dir = diskimage_builder/locale
-input_file = diskimage_builder/locale/diskimage_builder.pot
+[files]
+data_files =
+    share/tripleo-image-elements = elements/*
 
-[compile_catalog]
-directory = diskimage_builder/locale
-domain = diskimage_builder
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
diff --git a/setup.py b/setup.py
index 75f32427b..3e74fe081 100755
--- a/setup.py
+++ b/setup.py
@@ -15,26 +15,6 @@
 
 import setuptools
 
-with open("README.md", 'rt') as readme:
-    readme_text = readme.read()
-
 setuptools.setup(
-    name='tripleo_image_elements',
-    version='0.0.1',
-    description="""Disk image elements for deploying OpenStack.""",
-    long_description=readme_text,
-    license='Apache License (2.0)',
-    author='HP Cloud Services',
-    author_email='nobody@hp.com',
-    url='https://github.com/stackforge/tripleo-image-elements',
-    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 :: Other',
-        'Environment :: Console',
-    ],
-    scripts=[],
-    py_modules=[])
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
+    d2to1=True)