diff --git a/.gitignore b/.gitignore
index 72364f9..3b5298a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+AUTHORS
+ChangeLog
 .Python
 env/
 build/
diff --git a/setup.cfg b/setup.cfg
index b977279..bf6ebc1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,30 @@
-[wheel]
-universal = 1
-
 [metadata]
+name = collectd-rabbitmq-monitoring
+author = Alex Krzos
+author-email = akrzos@redhat.com
+summary = Collectd plugin for Rabbitmq.
 description-file = README.rst
+url = https://github.com/akrzos/collectd-rabbitmq-monitoring
+home-page = https://github.com/akrzos/collectd-rabbitmq-monitoring
+license = Apache-2
+classifier =
+    Development Status :: 5 - Production/Stable
+    Intended Audience :: Developers
+    Intended Audience :: Information Technology
+    Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
+    Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.5
+    Topic :: System :: Monitoring
+
+[global]
+setup-hooks = pbr.hooks.setup_hook
+
+[files]
+packages = collectd_rabbitmq_monitoring
+
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index 360543a..23545f7 100644
--- a/setup.py
+++ b/setup.py
@@ -13,37 +13,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-import os
-from setuptools import setup
-
 
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+from setuptools import setup
 
 setup(
-    name='collectd-rabbitmq-monitoring',
-    version='0.0.3',
-    description='Collectd plugin for Rabbitmq.',
-    long_description=read('README.rst'),
-    url='https://github.com/akrzos/collectd-rabbitmq-monitoring',
-    author='Alex Krzos',
-    author_email='akrzos@redhat.com',
-    packages=[
-        'collectd_rabbitmq_monitoring',
-    ],
-    install_requires=[
-        'pyrabbit'
-    ],
-    license='Apache License 2.0',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: Apache Software License ',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Topic :: System :: Monitoring',
-    ],
+    setup_requires=['pbr'],
+    pbr=True,
 )