diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000..1bdc73d
--- /dev/null
+++ b/CHANGES.rst
@@ -0,0 +1,25 @@
+.. :changelog:
+
+Changelog
+---------
+
+v0.2 (2012-09-21)
+^^^^^^^^^^^^^^^^^
+
+- Added optional ``--configuration`` management command option similar
+  to Django's ``--settings`` option
+
+- Fixed the runserver message about which setting is used to
+  show the correct class
+
+- Stopped hiding AttributeErrors happening during initialization
+  of settings classes
+
+- Simplified tests
+
+- Minor documentation fixes
+
+v0.1 (2012-07-21)
+^^^^^^^^^^^^^^^^^
+
+- Initial public release
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f6219c..2bb1437 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.rst
+include CHANGES.rst
 include .travis.yml
 include manage.py
 include requirements/tests.txt
diff --git a/docs/index.rst b/docs/index.rst
index b1c969e..275eb79 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -89,7 +89,7 @@ should be ``Prod``. In bash that would be::
 
 Alternatively you can use the ``--configuration`` option when using Django
 management commands along the lines of Django's default ``--settings``
-command line option::
+command line option, e.g.::
 
     python manage.py runserver --settings=mysite.settings --configuration=Prod
 
@@ -131,8 +131,10 @@ a Settings class::
         DEBUG = False
         # ...
 
-Thanks
-------
+Alternatives
+------------
+
+Many thanks to those project that have previously solved these problems:
 
 - The Pinax_ project for spearheading the efforts to extend the Django
   project metaphor with reusable project templates and a flexible
@@ -152,4 +154,6 @@ requests and bug reports at the usual place:
 
     https://github.com/jezdez/django-configurations/issues
 
-Thanks!
\ No newline at end of file
+Thanks!
+
+.. include:: ../CHANGES.rst
diff --git a/setup.py b/setup.py
index 7649ec0..577b686 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
     version=find_version('configurations', '__init__.py'),
     description='A helper for organizing Django project settings by relying '
                 'on well established programming patterns.',
-    long_description=read('README.rst'),
+    long_description=read('README.rst') + u'\n\n' + read('CHANGES.rst'),
     author='Jannis Leidel',
     author_email='jannis@leidel.info',
     license='BSD',