diff --git a/changelog.rst b/changelog.rst
new file mode 100644
index 0000000..d8ad76c
--- /dev/null
+++ b/changelog.rst
@@ -0,0 +1,42 @@
+Release history
+###############
+
+0.6.0 (2015-04-14)
+==================
+
+* Bugfixes (and travis-ci integration).
+* `API documentation <http://pwnypack.readthedocs.org/>`_ and docstrings.
+* Cycle-find can read from stdin.
+* Major refactoring of ELF class. It can now parse section headers, program
+  headers, symbol tables and extract section, symbols.
+* Major refactoring of Target class. It's no longer tied to ELF (ELF is still
+  a subclass of Target though).
+* A reghex compiler.
+* Verifying ROP gadget finder.
+* Disassembler functionality (based on ndisasm or capstone).
+* A more
+* The ability to redirect stderr to stdout in flow.ProcessChannel.
+* The ability to create symlinks for commandline apps.
+* New commandline apps:
+    * ``asm`` to assemble from commandline.
+    * ``symbols`` to list the symbol table of an ELF file.
+    * ``gadget`` to find ROP gadgets in an ELF file.
+    * ``symbol-extract`` to extract a symbol from an ELF file.
+    * ``symbol-disasm`` to disassemble a symbol in an ELF file.
+
+0.5.2 (2015-03-22)
+==================
+
+* Added command line apps and a customized IPython shell.
+
+0.5.1 (2015-03-21)
+==================
+
+* Python3 fixes for flow:
+    * Use latin1 for echo mode as not everything will be encodable as utf-8.
+    * Disable buffering on subprocess.
+
+0.5.0 (2015-03-21)
+==================
+
+* Initial release.
diff --git a/setup.py b/setup.py
index dfe5f51..d280891 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ def read_file(filename):
     packages=['pwny', 'pwnypack'],
     version=__version__,
     description='Official Certified Edible Dinosaurs CTF toolkit.',
-    long_description=read_file('README.rst'),
+    long_description=read_file('README.rst') + '\n' + read_file('changelog.rst'),
     author='Ingmar Steen',
     author_email='iksteen@gmail.com',
     url='https://github.com/edibledinos/pwnypack/',