diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 00000000..45e683c6
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,19 @@
+Changelog
+=========
+
+Version 0.2 (2012-03-09)
+------------------------
+
+* Added support for hostname and sysctl (kernel parameters)
+* Added support for Redis
+* Simplified API for supervisor processes
+
+Version 0.1.1 (2012-02-19)
+--------------------------
+
+* Packaging fixes
+
+Version 0.1 (2012-02-19)
+------------------------
+
+* Initial release
diff --git a/README.rst b/README.rst
index f51e195e..ea34775c 100644
--- a/README.rst
+++ b/README.rst
@@ -100,3 +100,4 @@ You can specify which base boxes should be used by setting the VAGRANT_BOXES env
 You can also use this to manually disable functional tests::
 
     VAGRANT_BOXES='' python -m unittest tests
+
diff --git a/setup.py b/setup.py
index 717a3795..7b854324 100644
--- a/setup.py
+++ b/setup.py
@@ -12,9 +12,9 @@ def read(filename):
 
 setup(
     name='fabtools',
-    version='0.1.1',
+    version='0.2',
     description='Tools for writing awesome Fabric files',
-    long_description=read('README.rst'),
+    long_description=read('README.rst') + read('CHANGELOG.rst'),
     author='Ronan Amicel',
     author_email='ronan.amicel@gmail.com',
     url='http://github.com/ronnix/fabtools',