diff --git a/setup.py b/setup.py
index f4d5127..2280522 100644
--- a/setup.py
+++ b/setup.py
@@ -35,12 +35,14 @@ setup(name='plone.app.discussion',
       open('CHANGES.rst').read(),
       classifiers=[
           "Development Status :: 5 - Production/Stable",
+          "Environment :: Web Environment",
           "Framework :: Plone",
           "Framework :: Plone :: 6.0",
           "Framework :: Plone :: Core",
+          "Framework :: Zope :: 5",
           "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
+          "Operating System :: OS Independent",
           "Programming Language :: Python",
-          "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: 3.8",
       ],