diff --git a/MANIFEST.in b/MANIFEST.in
index bec6d1a3..2f2ea824 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
 include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png *.in
-include LICENSE THANKS
+include LICENSE THANKS docs/changelog.rst
 recursive-include tests *
 recursive-exclude tests *.pyc
diff --git a/setup.py b/setup.py
index 326a3195..15ddebd6 100755
--- a/setup.py
+++ b/setup.py
@@ -18,15 +18,20 @@ entry_points = {
    ]
 }
 
+
+README = open('README.rst').read()
+CHANGELOG = open('docs/changelog.rst').read()
+
+
 setup(
     name="pelican",
     version="3.2",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',
-    description="A tool to generate a static blog from reStructuredText or "\
+    description="A tool to generate a static blog from reStructuredText or "
                 "Markdown input files.",
-    long_description=open('README.rst').read(),
+    long_description=README + '\n' + CHANGELOG,
     packages=['pelican', 'pelican.tools', 'pelican.plugins'],
     include_package_data=True,
     install_requires=requires,