diff --git a/CHANGELOG b/CHANGELOG
index 2396a9a87..4d7dae038 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,8 @@ Changes between 2.3.2 and 2.3.3.dev
 
 - nose support: only call setup, if its a callable
 
+- fix issue219 - add py2.4-3.3 classifiers to TROVE list
+
 
 Changes between 2.3.1 and 2.3.2
 -----------------------------------
diff --git a/setup.py b/setup.py
index 9962b16ac..ecdaed129 100644
--- a/setup.py
+++ b/setup.py
@@ -43,8 +43,10 @@ def main():
                      'Topic :: Software Development :: Testing',
                      'Topic :: Software Development :: Libraries',
                      'Topic :: Utilities',
-                     'Programming Language :: Python',
-                     'Programming Language :: Python :: 3'],
+                     'Programming Language :: Python :: 2',
+                     'Programming Language :: Python :: 3'] + [
+        ("Programming Language :: Python :: %s" % x) for x in
+            "2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3".split()],
         packages=['_pytest', '_pytest.assertion'],
         py_modules=['pytest'],
         zip_safe=False,