diff --git a/CHANGES.txt b/CHANGES.rst
similarity index 100%
rename from CHANGES.txt
rename to CHANGES.rst
diff --git a/README.txt b/README.rst
similarity index 100%
rename from README.txt
rename to README.rst
diff --git a/setup.py b/setup.py
index 5024f4dc..78f3ae73 100644
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,14 @@
 
 setup(
     name='Products.ZCatalog',
-    version='3.1.2.dev',
+    version='3.1.2.dev0',
     url='https://pypi.python.org/pypi/Products.ZCatalog',
     license='ZPL 2.1',
     description="Zope 2's indexing and search solution.",
     author='Zope Foundation and Contributors',
     author_email='zope-dev@zope.org',
-    long_description=open('README.txt').read() + '\n' +
-                     open('CHANGES.txt').read(),
+    long_description=open('README.rst').read() + '\n' +
+                     open('CHANGES.rst').read(),
     packages=find_packages('src'),
     namespace_packages=['Products'],
     package_dir={'': 'src'},
@@ -35,7 +35,6 @@
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2 :: Only",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: Implementation :: CPython",
     ],