diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..dc9817d
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,23 @@
+==========
+Changelog:
+==========
+
+v1.0 (master):
+
+* Django 1.10 compatibility and total cleanup.
+* Full Python 3 compatibility.
+* Removed Pinax Group support.
+* Tests.
+
+v0.3: (2009-08-06):
+
+* If a wikipage was not found, the view now raises a proper Http404 instead of a
+  (silent) HttpResponseNotFound. This gives you the ability to display a proper
+  404 page.
+* All templates are now translatable using gettext.
+
+v0.2 (2009-07-22):
+
+* Edit-forms are now replaceable
+
+.. _`django-attachments`: http://github.com/bartTC/django-attachments/
diff --git a/MANIFEST.in b/MANIFEST.in
index 708f640..c6ac96b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,5 @@
 include LICENSE
 include README.rst
+include CHANGELOG
 recursive-include src/wakawaka/templates/wakawaka *
+recursive-include docs *
diff --git a/README.rst b/README.rst
index 5d2d102..627cc51 100644
--- a/README.rst
+++ b/README.rst
@@ -115,27 +115,3 @@ application into an existing project. It's alo used for the test suite::
     in a Django project..
 
 .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
-
-
-Changelog:
-==========
-
-v1.0 (master):
-
-* Django 1.10 compatibility and total cleanup.
-* Full Python 3 compatibility.
-* Removed Pinax Group support.
-* Tests.
-
-v0.3: (2009-08-06):
-
-* If a wikipage was not found, the view now raises a proper Http404 instead of a
-  (silent) HttpResponseNotFound. This gives you the ability to display a proper
-  404 page.
-* All templates are now translatable using gettext.
-
-v0.2 (2009-07-22):
-
-* Edit-forms are now replaceable
-
-.. _`django-attachments`: http://github.com/bartTC/django-attachments/
diff --git a/setup.py b/setup.py
index 117fd3a..809271c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,29 +1,59 @@
 #!/usr/bin/env python
-from setuptools import setup, find_packages
+from sys import exit
 
-requirements = [
-    'django>=1.8',
-]
+from setuptools import find_packages, setup
+from setuptools.command.test import test as TestCommand
 
-test_requirements = [
-]
+
+class Tox(TestCommand):
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = []
+        self.test_suite = True
+
+    def run_tests(self):
+        #import here, cause outside the eggs aren't loaded
+        import tox
+        errno = tox.cmdline(self.test_args)
+        exit(errno)
+
+long_description = u'\n\n'.join((
+    open('README.rst').read(),
+    open('CHANGELOG').read()
+))
 
 setup(
     name='django-wakawaka',
-    version='1.0a',
-    description='A super simple wiki app written in Python using the Django Framwork',
-    long_description=open('README.rst').read(),
+    version='1.0a1',
+    description='django-wakawka is a super simple wiki system written in Python '
+                'using the Django framework.',
+    long_description=long_description,
     author='Martin Mahner',
     author_email='martin@mahner.org',
-    url='http://github.com/bartTC/django-wakawaka/',
+    url='https://github.com/bartTC/django-wakawaka/',
+    classifiers=[
+        'Development Status :: 3 - Alpha',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
+        'Framework :: Django',
+    ],
     packages=find_packages(),
     package_data={
-        'wakawaka/': [
-            'static/*.*',
-            'templates/*.*'
-        ]
+        'dpaste': ['static/*.*', 'templates/*.*'],
+        'docs': ['*'],
+    },
+    include_package_data=True,
+    install_requires=[
+        'django>=1.8',
+    ],
+    tests_require=[
+        'tox>=1.6.1'
+    ],
+    cmdclass={
+        'test': Tox
     },
-    install_requires=requirements,
-    tests_require=test_requirements,
-    zip_safe=False,
 )