diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py
index 18f92379b8..6dd2b32ef4 100644
--- a/makepanda/makewheel.py
+++ b/makepanda/makewheel.py
@@ -526,11 +526,6 @@ def makewheel(version, output_dir, platform=None):
 
     # Update relevant METADATA entries
     METADATA['version'] = version
-    version_classifiers = [
-        "Programming Language :: Python :: {0}".format(*sys.version_info),
-        "Programming Language :: Python :: {0}.{1}".format(*sys.version_info),
-    ]
-    METADATA['classifiers'].extend(version_classifiers)
 
     # Build out the metadata
     details = METADATA["extensions"]["python.details"]
diff --git a/setup.cfg b/setup.cfg
index 8a1a50afe0..a51084e2e8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,10 +13,21 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: C++
     Programming Language :: Python
+    Programming Language :: Python :: 2
+    Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: Implementation :: CPython
     Topic :: Games/Entertainment
     Topic :: Multimedia
     Topic :: Multimedia :: Graphics
     Topic :: Multimedia :: Graphics :: 3D Rendering
+    Topic :: Software Development :: Libraries
+    Topic :: Software Development :: Libraries :: Application Frameworks
+    Topic :: Software Development :: Libraries :: Python Modules
 author = Panda3D Team
 author_email = etc-panda3d@lists.andrew.cmu.edu