diff --git a/CHANGELOG b/CHANGELOG.rst
similarity index 100%
rename from CHANGELOG
rename to CHANGELOG.rst
diff --git a/MANIFEST.in b/MANIFEST.in
index 1009dea..c89f573 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
-recursive-include spynepi/const/template/*
-include CHANGELOG
+recursive-include spynepi/const/template *.html
+include CHANGELOG.rst
diff --git a/setup.py b/setup.py
index 1d99414..fd33301 100755
--- a/setup.py
+++ b/setup.py
@@ -11,11 +11,20 @@
 v = open(os.path.join(os.path.dirname(__file__), PROJECT_NAME, '__init__.py'), 'r')
 VERSION = re.match(r".*__version__ = '(.*?)'", v.read(), re.S).group(1)
 
+LONG_DESC = ""
+
+try:
+    os.stat('CHANGELOG.rst')
+    LONG_DESC = open('CHANGELOG.rst', 'r').read()
+except OSError:
+    pass
+
 setup(
     name=PROJECT_NAME,
     packages=find_packages(),
     version=VERSION,
     description="This is a caching PyPI implementation that uses spyne",
+    long_description=LONG_DESC,
     classifiers=[
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
@@ -30,7 +39,7 @@
     license='GPL',
 
     install_requires=[
-        "spyne>=2.10", "sqlalchemy<0.8", "werkzeug", "twisted",
+        "spyne>=2.9","sqlalchemy<0.8", "werkzeug", "twisted",
     ],
     include_package_data=True,
     entry_points = {