diff --git a/docs/HISTORY.txt b/CHANGES.rst
similarity index 100%
rename from docs/HISTORY.txt
rename to CHANGES.rst
diff --git a/docs/CREDITS.txt b/CONTRIBUTORS.rst
similarity index 100%
rename from docs/CREDITS.txt
rename to CONTRIBUTORS.rst
diff --git a/README.rst b/README.rst
index b7b8807..d941440 100644
--- a/README.rst
+++ b/README.rst
@@ -33,6 +33,24 @@ site in the future.
 This package helps you make your Plone site comply with these `technical
 requirements`_.
 
+Installation
+============
+
+To enable this product in a buildout-based installation:
+
+1. Edit your buildout.cfg and add ``collective.googlenews`` to the list of eggs to install::
+
+    [buildout]
+    ...
+    eggs =
+        collective.googlenews
+
+After updating the configuration you need to run ''bin/buildout'', which will take care of updating your system.
+
+Go to the 'Site Setup' page in a Plone site and click on the 'Add-ons' link.
+
+Check the box next to ``collective.googlenews`` and click the 'Activate' button.
+
 Article URLs
 ============
 
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
deleted file mode 100644
index 30ab573..0000000
--- a/docs/INSTALL.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Installation
-============
-
-To enable this product in a buildout-based installation:
-
-1. Edit your buildout.cfg and add ``collective.googlenews`` to the list of
-   eggs to install::
-
-    [buildout]
-    ...
-    eggs =
-        collective.googlenews
-
-2. If you are using Plone 4.0, you may need to extend a plone.app.registry
-   known good set (KGS) to make sure that you get the right versions of the
-   packages that make up plone.app.registry::
-
-    [buildout]
-    ...
-    extends =
-        https://good-py.appspot.com/release/plone.app.registry/1.0b2
-
-After updating the configuration you need to run ''bin/buildout'', which will
-take care of updating your system.
-
-Go to the 'Site Setup' page in a Plone site and click on the 'Add-ons' link.
-
-Check the box next to ``collective.googlenews`` and click the 'Activate'
-button.
-
-Note: You may have to empty your browser cache and save your resource
-registries in order to see the effects of the product installation.
-
diff --git a/setup.py b/setup.py
index ce0a469..5e371c8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,13 @@
-from setuptools import setup, find_packages
-import os
+# -*- coding: utf-8 -*-
+from setuptools import find_packages
+from setuptools import setup
 
 version = '2.0a1.dev0'
-long_description = open("README.rst").read() + "\n" + \
-                   open(os.path.join("docs", "INSTALL.txt")).read() + "\n" + \
-                   open(os.path.join("docs", "CREDITS.txt")).read() + "\n" + \
-                   open(os.path.join("docs", "HISTORY.txt")).read()
+long_description = (
+    open('README.rst').read() + '\n' +
+    open('CONTRIBUTORS.rst').read() + '\n' +
+    open('CHANGES.rst').read()
+)
 
 setup(name='collective.googlenews',
       version=version,
@@ -20,7 +22,6 @@
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: OS Independent",
-        "Programming Language :: JavaScript",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         "Topic :: Office/Business :: News/Diary",