diff --git a/setup.py b/setup.py
index 12323aead..01cd31791 100755
--- a/setup.py
+++ b/setup.py
@@ -258,9 +258,36 @@ setuptools.setup(
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Unix Shell',
+        'Topic :: Communications',
+        'Topic :: Communications :: Chat',
+        'Topic :: Communications :: Chat :: Internet Relay Chat',
+        'Topic :: Communications :: File Sharing',
+        'Topic :: Internet',
+        'Topic :: Internet :: Name Service (DNS)'
+        'Topic :: Internet :: Proxy Servers',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Wiki',
+        'Topic :: Internet :: WWW/HTTP :: WSGI',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Application',
+        'Topic :: Office/Business',
+        'Topic :: Office/Business :: Scheduling',
+        'Topic :: Security',
+        'Topic :: System'
+        'Topic :: System :: Archiving',
+        'Topic :: System :: Archiving :: Backup',
+        'Topic :: System :: Distributed Computing'
+        'Topic :: System :: Filesystems',
+        'Topic :: System :: Installation/Setup',
+        'Topic :: System :: Networking',
+        'Topic :: System :: Networking :: Firewalls',
+        'Topic :: System :: Operating System',
+        'Topic :: System :: Software Distribution'
         'Topic :: System :: Systems Administration',
+        'Topic :: System :: Systems Administration :: Authentication/Directory',
+        'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP   ',
+        'Topic :: System :: System Shells',
     ],
     setup_requires=['pytest-runner', 'setuptools-git'],
     install_requires=[