diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..a414c6d
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,46 @@
+[metadata]
+name = pypodman
+home-page = https://github.com/containers/python-pypodman
+project_urls =
+    Bug Tracker = https://github.com/containers/python-pypodman/issues
+    Source Code = https://github.com/containers/python-pypodman
+summary = A client for communicating with a Podman server
+description-file = 
+    README.md
+author = Jhon Honce
+author-email = jhonce@redhat.com
+license = Apache Software License
+classifier =
+    Development Status :: 3 - Alpha
+    Intended Audience :: Developers
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Operating System :: MacOS :: MacOS X
+    Operating System :: Microsoft :: Windows
+    Operating System :: POSIX
+    Programming Language :: Python :: 3.4
+    Topic :: System :: Systems Administration
+    Topic :: Utilities
+keywords =
+    varlink
+    libpod
+    podman
+    pypodman
+
+[files]
+packages =
+    pypodman
+
+[extras]
+devel=
+    fixtures
+    pbr
+    tox
+    bandit
+
+[entry_points]
+console_scripts =
+    pypodman = pypodman.main:main
+
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index f07e892..dace81c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,45 +1,9 @@
 #!/usr/bin/env python
 
-import os
-
-from setuptools import find_packages, setup
-
-root = os.path.abspath(os.path.dirname(__file__))
-
-with open(os.path.join(root, 'README.md')) as me:
-    readme = me.read()
-
-with open(os.path.join(root, 'requirements.txt')) as r:
-    requirements = r.read().splitlines()
-
+from setuptools import setup
 
 setup(
-    name='pypodman',
-    version=os.environ.get('PODMAN_VERSION', '0.0.0'),
-    description='A client for communicating with a Podman server',
-    author_email='jhonce@redhat.com',
-    author='Jhon Honce',
-    license='Apache Software License',
-    long_description=readme,
-    entry_points={'console_scripts': [
-        'pypodman = pypodman.main:main',
-    ]},
-    include_package_data=True,
-    install_requires=requirements,
-    packages=find_packages(exclude=['test']),
-    python_requires='>=3',
-    zip_safe=True,
-    url='http://github.com/containers/libpod',
-    keywords='varlink libpod podman pypodman',
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: MacOS :: MacOS X',
-        'Operating System :: Microsoft :: Windows',
-        'Operating System :: POSIX',
-        'Programming Language :: Python :: 3.4',
-        'Topic :: System :: Systems Administration',
-        'Topic :: Utilities',
-    ])
+    setup_requires=['pbr'],
+    pbr=True,
+    long_description_content_type="text/markdown",
+)