diff --git a/README.md b/README.md
index 62c0e6a2..90054f57 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ open an issue.
 
 ## License
 
-GNU General Public License v2.
+GNU General Public License v2.0 or later.
 
 
 ## Downloads
diff --git a/pyproject.toml b/pyproject.toml
index 9fefd553..1601d1bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,8 @@ description = "IMAP synchronization tool"
 authors = [
     { name = "John Goerzen & contributors", email = "jgoerzen@complete.org" }
 ]
-license = { text = "GPL-2.0" }
+license = "GPL-2.0-or-later"
+license-files = ["COPYING"]
 readme = "README.md"
 keywords = ["client", "imap", "cli", "email", "mail", "synchronization", "sync", "offline"]
 requires-python = ">=3.6"
@@ -19,7 +20,6 @@ requires-python = ">=3.6"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
-    "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     "Operating System :: POSIX",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.6",
diff --git a/setup.py b/setup.py
index 9bf3be1b..096c43bd 100644
--- a/setup.py
+++ b/setup.py
@@ -83,7 +83,7 @@
                 'offlineimap.utils'],
       scripts=['bin/offlineimap'],
       setup_requires=['setuptools>=18.5', 'wheel', 'imaplib2'],
-      license=copyright + ", Licensed under the GPL version 2",
+      license=copyright + ", Licensed under the GPL version 2 or later",
       install_requires=['distro',
                         'imaplib2>=3.5',
                         'rfc6555',