diff --git a/MANIFEST.in b/MANIFEST.in
index 39208ad..0aa9bda 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
+include changelog.rst
 include COPYING
 include README.rst
 include requirements.txt
diff --git a/changelog.rst b/changelog.rst
index f6a2ca3..8b4eb7c 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,6 +1,11 @@
 Changelog
 *********
 
+0.6.1
+-----
+* Add changelog to packaged version
+* Adjust long description for PyPi
+
 0.6.0
 -----
 * Add support for latest pycountry (https://github.com/anexia-it/geofeed-validator/issues/4, thanks vangesseld)
diff --git a/geofeed_validator/__init__.py b/geofeed_validator/__init__.py
index 0bb1dc8..3282065 100644
--- a/geofeed_validator/__init__.py
+++ b/geofeed_validator/__init__.py
@@ -30,7 +30,7 @@
 from geofeed_validator.utils import is_file_like_object
 from geofeed_validator.validator.base import BaseValidator, Registry
 
-__version__ = '0.6.0'
+__version__ = '0.6.1'
 
 
 class GeoFeedValidator(object):
diff --git a/setup.py b/setup.py
index 408c37b..460c1e4 100755
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,14 @@
 import os
 
 
+def get_long_description():
+    """
+    Get README.rst content for use as long descption
+    """
+    this_directory = os.path.abspath(os.path.dirname(__file__))
+    with open(os.path.join(this_directory, 'README.rst'), encoding='utf-8') as f:
+        return f.read()
+
 def get_version(package):
     """
     Return package version as listed in `__version__` in `init.py`.
@@ -38,6 +46,7 @@ def get_version(package):
     init_py = open(os.path.join(package, '__init__.py')).read()
     return re.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
 
+long_description = get_long_description()
 version = get_version('geofeed_validator')
 
 setup(
@@ -45,6 +54,8 @@ def get_version(package):
     version=version,
     license='AGPLv3+',
     description='Validator library for self-published geo feeds',
+    long_description=long_description,
+    long_description_content_type='text/x-rst',
     author='Stephan Peijnik',
     author_email='speijnik@anexia-it.com',
     packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),