diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 00000000..86cca474
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,15 @@
+.. :changelog:
+
+Changelog
+---------
+
+0.6.0 (2013-05-14)
+++++++++++++++++++
+
+* much faster parser with builtin part caching
+* a test suite, thanks @tkf
+
+0.5 versions (2012)
++++++++++++++++++++
+
+* Initial development
diff --git a/setup.py b/setup.py
index 4d291a8c..63707746 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ from setuptools import setup
 __AUTHOR__ = 'David Halter'
 __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'
 
-readme = open('README.rst').read()
+readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read()
 
 import jedi
 VERSION = '.'.join(str(x) for x in jedi.__version__)