diff --git a/setup.py b/setup.py
index bbebf57..547e118 100644
--- a/setup.py
+++ b/setup.py
@@ -49,9 +49,6 @@
         'Intended Audience :: End Users/Desktop',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: Apache Software License',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
-        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',
@@ -65,6 +62,8 @@
         'Topic :: Office/Business',
         'Topic :: Software Development :: Libraries :: Python Modules',
       ],
+      license = "GPL-2.0-or-later OR Apache-2.0",
+      license-files = ["GPL-LICENSE-2.txt", "APACHE-LICENSE-2.0.txt"],
       description='Python API and tools to manipulate OpenDocument files',
       long_description = (
 """