diff --git a/setup.py b/setup.py
index 79302e9ae..23e708727 100644
--- a/setup.py
+++ b/setup.py
@@ -168,6 +168,9 @@ setup(
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'Intended Audience :: Education',
+        'Intended Audience :: End Users/Desktop',
+        'Intended Audience :: Science/Research',
+        'Intended Audience :: System Administrators',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
@@ -179,12 +182,22 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
+        'Framework :: Setuptools Plugin',
         'Framework :: Sphinx',
         'Framework :: Sphinx :: Extension',
         'Framework :: Sphinx :: Theme',
         'Topic :: Documentation',
         'Topic :: Documentation :: Sphinx',
+        'Topic :: Internet :: WWW/HTTP :: Site Management',
+        'Topic :: Printing',
+        'Topic :: Software Development',
+        'Topic :: Software Development :: Documentation',
         'Topic :: Text Processing',
+        'Topic :: Text Processing :: General',
+        'Topic :: Text Processing :: Indexing',
+        'Topic :: Text Processing :: Markup',
+        'Topic :: Text Processing :: Markup :: HTML',
+        'Topic :: Text Processing :: Markup :: LaTeX',
         'Topic :: Utilities',
     ],
     platforms='any',