diff --git a/celery_haystack/__init__.py b/celery_haystack/__init__.py
index 0a990c1dc2559c7966baf94ee58600e177d3ebbf..3b3dacb9af5d02c79a61671f486e942fb219a921 100644
--- a/celery_haystack/__init__.py
+++ b/celery_haystack/__init__.py
@@ -1,5 +1 @@
 __version__ = '2.0'
-
-
-def version_hook(config):
-    config['metadata']['version'] = __version__
diff --git a/setup.cfg b/setup.cfg
index cc5e2cc8a8d932cf31a62f9329cb94a2a1566bb9..ac7bfe160c4a346abe37feb41f2d496a8ea023fe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,17 +1,14 @@
-[global]
-setup-hooks =
-    celery_haystack.version_hook
-
 [metadata]
 name = celery-haystack-ng
+version = attr: celery_haystack.__version__
 author = Dominik George
-author-email = dominik.george@teckids.org
-summary = An app for integrating Celery with Haystack
-description-file = README.rst
-home-page = http://celery-haystack-ng.rtfd.org/
-project-url =
-    https://edugit.org/AlekSIS/libs/celery-haystack-ng
-classifier =
+author_email = dominik.george@teckids.org
+description = An app for integrating Celery with Haystack
+long_description = file: README.rst
+url = http://celery-haystack-ng.rtfd.org/
+project_urls =
+    Code=https://edugit.org/AlekSIS/libs/celery-haystack-ng
+classifiers =
     Development Status :: 4 - Beta
     Environment :: Web Environment
     Framework :: Django
@@ -22,20 +19,11 @@ classifier =
     Topic :: Utilities
 
 [options]
+packages = find:
 install_requires =
     django-appconf>=0.4.1
     django-haystack>=2.0
     celery>=4.0
-
-[files]
-packages =
-    celery_haystack
-    celery_haystack.tests
-extra_files =
-    README.rst
-    AUTHORS
-
-[backwards_compat]
 zip_safe = False
 
 [wheel]
diff --git a/setup.py b/setup.py
index 0fe0c2f8ffd2c0cfa67aa4e0a52dda3cc8c07eff..c82334553632d12caf96bd3d3d332d9683d2635c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-setup(setup_requires=['d2to1'], d2to1=True)
+setup()