diff --git a/setup.py b/setup.py
index a38217c7d38ba8f8fc00e1db169199e2c807e206..138cb944623dfde86eb841557631913ed65b7653 100755
--- a/setup.py
+++ b/setup.py
@@ -175,10 +175,20 @@ def install_weboob(qt, xdg):
             'Environment :: Console',
             'Environment :: X11 Applications :: Qt',
             'License :: OSI Approved :: GNU Affero General Public License v3',
+            'Programming Language :: Python',
+            'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
+            'Programming Language :: Python :: 3.5',
+            'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
             'Programming Language :: Python',
             'Topic :: Communications :: Email',
             'Topic :: Internet :: WWW/HTTP',
+            'Topic :: Internet :: WWW/HTTP :: Browsers',
+            'Topic :: Software Development :: Libraries :: Application Frameworks',
+            'Topic :: Software Development :: Libraries :: Python Modules',
+            'Topic :: Text Processing :: Markup :: HTML',
         ],
 
         packages=packages,