diff --git a/README.rst b/README.rst
index b83e4e9..6f793b8 100644
--- a/README.rst
+++ b/README.rst
@@ -16,13 +16,22 @@ IronPython and Jython.
 Requirements
 -------------
 
-* Python 2.6, 2.7 or 3.3
+* Python -- one of the following:
 
- * http://www.python.org/
+  - CPython_ >= 2.6 or >= 3.3
+  - PyPy_ >= 2.0
+  - IronPython_ 2.7
+* MySQL Server -- one of the following:
 
-* MySQL 4.1 or higher
+  - MySQL_ >= 4.1
+  - MariaDB_ >= 5.1
+
+.. _CPython: http://www.python.org/
+.. _PyPy: http://pypy.org/
+.. _IronPython: http://ironpython.net/
+.. _MySQL: http://www.mysql.com/
+.. _MariaDB: https://mariadb.org/
 
- * protocol41 support, experimental 4.0 support
 
 Installation
 ------------
diff --git a/setup.py b/setup.py
index f84a07c..09a0254 100755
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,10 @@ setup(
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: IronPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',