diff --git a/setup.py b/setup.py
index 01042ecb..c9acf2c0 100644
--- a/setup.py
+++ b/setup.py
@@ -121,16 +121,20 @@ def build_setuptools():
             "Environment :: Console",
             "Intended Audience :: End Users/Desktop",
             "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
-            "Operating System :: Microsoft :: Windows",
-            "Operating System :: POSIX",
-            "Operating System :: MacOS",
+            "Operating System :: OS Independent",
+            "Programming Language :: Python",
+            "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 3 :: Only",
             "Programming Language :: Python :: 3.4",
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",
             "Programming Language :: Python :: 3.9",
-            "Programming Language :: Python :: 3 :: Only",
+            "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
+            "Programming Language :: Python :: Implementation :: CPython",
+            "Programming Language :: Python :: Implementation :: PyPy",
             "Topic :: Internet :: WWW/HTTP",
             "Topic :: Multimedia :: Graphics",
             "Topic :: Utilities",