diff --git a/README.rst b/README.rst
index 31a0d57..ad1de46 100644
--- a/README.rst
+++ b/README.rst
@@ -50,12 +50,12 @@ Main features
 -   Multi-protocol : REST+Json, REST+XML, SOAP, ExtDirect and more to come.
 -   Extensible : easy to add more protocols or more base types.
 -   Framework independance : adapters are provided to easily integrate
-your API in any web framework, for example a wsgi container,
-turbogears...
+    your API in any web framework, for example a wsgi container,
+    turbogears...
 -   Very few runtime dependencies: webob, simplegeneric
-(+ Genshi if you use SOAP).
+    (+ Genshi if you use SOAP).
 -   Integration in `Sphinx`_ for making clean documentation with
-wsme.sphinxext (work in progress).
+    wsme.sphinxext (work in progress).
 
 Install
 ~~~~~~~
diff --git a/setup.py b/setup.py
index 5aaec4d..6b50ee7 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,11 @@ setup(
         'Development Status :: 3 - Alpha',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'License :: OSI Approved :: MIT License',
         'Topic :: Internet :: WWW/HTTP :: WSGI',
         'Topic :: Software Development :: Libraries :: Python Modules',