diff --git a/setup.py b/setup.py
index 6dac4e4..28cea7e 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,9 @@ write_version_py()
 try:
     import pypandoc
     long_description = pypandoc.convert('README.md', 'rst')
+    changelog = pypandoc.convert('CHANGELOG.md', 'rst')
+    changelog = '\nChangelog\n=============\n' + changelog
+    long_description += changelog
 except (IOError, ImportError):
     long_description = ''