diff --git a/setup.py b/setup.py
index 2c96f62..34e4c9c 100644
--- a/setup.py
+++ b/setup.py
@@ -8,11 +8,11 @@
     description="Linux system information web dashboard",
     long_description="psdash is a system information web dashboard for linux using data mainly served by psutil",
     classifiers=[
-        "System :: Monitoring",
-        "System :: Logging",
-        "System :: Networking :: Monitoring",
+        "Topic :: System :: Monitoring",
+        "Topic :: System :: Logging",
+        "Topic :: System :: Networking :: Monitoring",
         "Development Status :: 4 - Beta",
-        "Operating System :: Linux",
+        "Operating System :: POSIX :: Linux",
         "Programming Language :: Python",
         "License :: Public Domain",
         "Intended Audience :: Developers",