diff --git a/setup.py b/setup.py
index b226f87..943fa7a 100755
--- a/setup.py
+++ b/setup.py
@@ -48,9 +48,14 @@ setup(name="pypiserver",
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: BSD License",
         "License :: OSI Approved :: zlib/libpng License",
+        "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.0",
+        "Programming Language :: Python :: 3.1",
+        "Programming Language :: Python :: 3.2",
         "Topic :: Software Development :: Build Tools",
         "Topic :: System :: Software Distribution"],
       **extrakw)