diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..3c6e79c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/setup.py b/setup.py
index a9d7f05..f9d3bf3 100644
--- a/setup.py
+++ b/setup.py
@@ -35,8 +35,24 @@
     version=version,
     packages=find_packages(),
     description="DNS tools",
+    url="https://github.com/gandi/dnsknife",
+    author="Gandi",
+    author_email="feedback@gandi.net",
+    license="GPLv3",
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Topic :: Internet :: Name Service (DNS)',
+        'Intended Audience :: Developers',
+    ],
     install_requires=requires,
     tests_require=tests_requires,
     test_suite='dnsknife.tests',
     extras_require=extras_require,
+    keywords='dns lookup dnssec tpda rdap',
 )