diff --git a/HISTORY.rst b/HISTORY.rst
index 1932074..a159f27 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,19 +1,20 @@
-=========
-Changelog
-=========
+.. :changelog:
+
+Release history
+===============
 
 0.3.1
-=====
+-----
 
 * Fix how empty responses are handled
 
 0.3.0
-=====
+-----
 
 * Added method to unsuspend suspended user
 
 0.2.0
-=====
+-----
 
 * Inital fork, including gberaudo's changes
 * Packaging cleanup, dropping Python 2.6 support and adding Python 3.5, PyPy,
@@ -21,7 +22,7 @@ Changelog
 * Packaging on PyPI
 
 0.1.0.dev
-=========
+---------
 
 All pre-PyPI development
 
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..7e8d5ff
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+include setup.py
+include README.rst
+include MANIFEST.in
+include HISTORY.rst
+include LICENSE
+recursive-include pydiscourse
diff --git a/setup.py b/setup.py
index d7f2f89..924f815 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup, find_packages
 
 
 README = open('README.rst').read()
+HISTORY = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
 with open("pydiscourse/__init__.py", "r") as module_file:
     for line in module_file:
@@ -14,7 +15,7 @@ setup(
     name="pydiscourse",
     version=VERSION,
     description="A Python library for the Discourse API",
-    long_description=README,
+    long_description=README + '\n\n' + HISTORY,
     author="Marc Sibson and contributors",
     author_email="ben+pydiscourse@benlopatin.com",
     license="BSD",