diff --git a/.gitignore b/.gitignore
index 2eafdc1150d676add14c7ae28327a39156e653e5..86ad221d716cfa5f308ea9a0acd99a156a0fe7bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *~
 build/*
 .coverage
+dist/*
+*egg-info*
 doc/build/*
 *.mldat
 *.npz
diff --git a/LICENCE.txt b/LICENCE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8aa26455d23acf904be3ed9dfb3a3efe3e49245a
--- /dev/null
+++ b/LICENCE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..9886c7c60948cf90b418897bd763fc3667cac456
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,6 @@
+[bdist_wheel]
+# This flag says to generate wheels that support both Python 2 and Python
+# 3. If your code will not run unchanged on both Python 2 and 3, you will
+# need to generate separate wheels for each Python version that you
+# support.
+universal=1
diff --git a/setup.py b/setup.py
index 323f345705584e6b8807cccfebce16daa467b189..012c432565d8295821f2fe445e0a05f0c323b037 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,36 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from distutils.core import setup
+from setuptools import setup, find_packages
 
 setup(
     name='astrotools',
-    version='2.0',
+    version='1.0.0rc1',
     description='Python Astro Tools',
     author='Gero Müller, Martin Urban, David Walz, Marcus Wirtz',
     author_email='gmueller@physik.rwth-aachen.de, murban@physik.rwth-aachen.de, walz@physik.rwth-aachen.de, '
                  'mwirtz@physik.rwth-aachen.de',
-    url='https://forge.physik.rwth-aachen.de/projects/astrotools',
+    license='MIT',
+    keywords='astro auger',
+    project_urls={
+        'Documentation': 'http://astro.pages.rwth-aachen.de/astrotools/',
+        'Source': 'https://git.rwth-aachen.de/astro/astrotools',
+        'Tutorial': 'http://astro.pages.rwth-aachen.de/astrotools/tutorial.html'
+        },
     packages=['astrotools'],
     package_data={'astrotools': ['data/*.txt', 'data/lnA/*', 'data/xmax/*', 'data/comp/*']},
-    requires=['numpy', 'healpy', 'matplotlib', 'scipy']
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        # Indicate who your project is intended for
+        'Intended Audience :: Developers',
+        'Topic :: Software Development :: Build Tools',
+        # Pick your license as you wish (should match "license" above)
+        'License :: OSI Approved :: MIT License',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
+        ],
+    install_requires=['numpy', 'healpy', 'matplotlib', 'scipy']
 )