diff --git a/docs/developer.rst b/docs/developer.rst
index 888133105f2..90b0545cd8b 100644
--- a/docs/developer.rst
+++ b/docs/developer.rst
@@ -335,7 +335,25 @@ version
     * must be a `semantic version <http://semver.org/>`_ without build metadata, e.g. 9.0.1 or 9.1.0-alpha.1
 licence
     * required
-    * must contain **agpl**, **mpl*** and/or **apache** as the only valid values. These refer to the AGPLv3, MPL 2.0 and Apache License 2.0
+    * can occur multiple times with different licenses
+    * must contain one of the following licenses (see the `SPDX License List <https://spdx.org/licenses/>`_ for details):
+
+        * **AGPL-3.0-only**
+        * **AGPL-3.0-or-later**
+        * **Apache-2.0**
+        * **GPL-3.0-only**
+        * **GPL-3.0-or-later**
+        * **MIT**
+        * **MPL-2.0**
+
+    * (deprecated) the following shorthand aliases are also used:
+
+        * **agpl** (AGPL-3.0)
+        * **apache** (Apache-2.0)
+        * **gpl3** (GPL-3.0)
+        * **mit** (MIT)
+        * **mpl** (MPL-2.0)
+
 author
     * required
     * can occur multiple times with different authors
diff --git a/nextcloudappstore/api/v1/release/info.xsd b/nextcloudappstore/api/v1/release/info.xsd
index cd716e0052b..d5244d4eef8 100644
--- a/nextcloudappstore/api/v1/release/info.xsd
+++ b/nextcloudappstore/api/v1/release/info.xsd
@@ -369,6 +369,15 @@
 
     <xs:simpleType name="licence">
         <xs:restriction base="xs:string">
+            <xs:enumeration value="AGPL-3.0-only"/>
+            <xs:enumeration value="AGPL-3.0-or-later"/>
+            <xs:enumeration value="Apache-2.0"/>
+            <xs:enumeration value="GPL-3.0-only"/>
+            <xs:enumeration value="GPL-3.0-or-later"/>
+            <xs:enumeration value="MIT"/>
+            <xs:enumeration value="MPL-2.0"/>
+
+            <!-- Deprecated -->
             <xs:enumeration value="agpl"/>
             <xs:enumeration value="mit"/>
             <xs:enumeration value="mpl"/>
diff --git a/nextcloudappstore/api/v1/release/pre-info.xslt b/nextcloudappstore/api/v1/release/pre-info.xslt
index 915aafb4575..a1297b33540 100644
--- a/nextcloudappstore/api/v1/release/pre-info.xslt
+++ b/nextcloudappstore/api/v1/release/pre-info.xslt
@@ -16,7 +16,21 @@
             <xsl:copy-of select="version"/>
             <xsl:for-each select="licence">
                 <licence>
-                    <xsl:value-of select="translate(., $uppercase, $lowercase)"/>
+                    <!--
+                        convert deprecated shorthand aliases to full SPDX identifiers where possible,
+                        leave agpl/gpl3 aliases as is for now (A/GPL-3.0 are also deprecated and thus not added to list of valid licenses)
+                    -->
+                    <xsl:variable name="licenseAlias" select="translate(., $uppercase, $lowercase)"/>
+                    <xsl:choose>
+                        <xsl:when test="$licenseAlias = 'agpl'">agpl</xsl:when>
+                        <xsl:when test="$licenseAlias = 'apache'">Apache-2.0</xsl:when>
+                        <xsl:when test="$licenseAlias = 'gpl3'">gpl3</xsl:when>
+                        <xsl:when test="$licenseAlias = 'mit'">MIT</xsl:when>
+                        <xsl:when test="$licenseAlias = 'mpl'">MPL-2.0</xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="."/>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </licence>
             </xsl:for-each>
             <xsl:copy-of select="author"/>
diff --git a/nextcloudappstore/api/v1/tests/data/infoxmls/app_api.xml b/nextcloudappstore/api/v1/tests/data/infoxmls/app_api.xml
index afb9bc28d83..188c0f732af 100644
--- a/nextcloudappstore/api/v1/tests/data/infoxmls/app_api.xml
+++ b/nextcloudappstore/api/v1/tests/data/infoxmls/app_api.xml
@@ -4,7 +4,7 @@
     <name>AppAPI Skeleton2</name>
     <description>Testing info.xml</description>
     <version>2.0.0</version>
-    <licence>AGPL</licence>
+    <licence>AGPL-3.0-or-later</licence>
     <author>Andrey Borysenko</author>
     <category>tools</category>
     <bugs>https://github.com/cloud-py-api/nc_py_api/issues</bugs>
diff --git a/nextcloudappstore/api/v1/tests/data/infoxmls/fullimport.xml b/nextcloudappstore/api/v1/tests/data/infoxmls/fullimport.xml
index 5a439d1db9b..f2eef64a4ad 100644
--- a/nextcloudappstore/api/v1/tests/data/infoxmls/fullimport.xml
+++ b/nextcloudappstore/api/v1/tests/data/infoxmls/fullimport.xml
@@ -16,7 +16,7 @@
     <version>8.8.2</version>
 
     <!-- only the AGPL license is possible -->
-    <licence>agpl</licence>
+    <licence>AGPL-3.0-or-later</licence>
 
     <!-- multiple authors are possible, mail and homepage field are optional -->
     <author mail="mail@provider.com" homepage="http://example.com">  Bernhard Posselt</author>
diff --git a/nextcloudappstore/api/v1/tests/data/infoxmls/minimal.xml b/nextcloudappstore/api/v1/tests/data/infoxmls/minimal.xml
index 62d27ef85ef..6b3f17a3ebf 100644
--- a/nextcloudappstore/api/v1/tests/data/infoxmls/minimal.xml
+++ b/nextcloudappstore/api/v1/tests/data/infoxmls/minimal.xml
@@ -5,7 +5,7 @@
     <summary>An RSS/Atom feed reader</summary>
     <description>An RSS/Atom feed reader</description>
     <version>8.8.2</version>
-    <licence>agpl</licence>
+    <licence>AGPL-3.0-or-later</licence>
     <author>Bernhard Posselt</author>
     <category>multimedia</category>
     <bugs>https://github.com/nextcloud/news/issues</bugs>
diff --git a/nextcloudappstore/api/v1/tests/test_parser.py b/nextcloudappstore/api/v1/tests/test_parser.py
index dbe568faeca..12165a35d1e 100644
--- a/nextcloudappstore/api/v1/tests/test_parser.py
+++ b/nextcloudappstore/api/v1/tests/test_parser.py
@@ -46,7 +46,7 @@ def test_parse_minimal(self):
                 "donations": [],
                 "release": {
                     "databases": [],
-                    "licenses": [{"license": {"id": "agpl"}}],
+                    "licenses": [{"license": {"id": "AGPL-3.0-or-later"}}],
                     "min_int_size": 32,
                     "php_extensions": [],
                     "php_max_version": "*",
diff --git a/nextcloudappstore/api/v1/tests/test_release_importer.py b/nextcloudappstore/api/v1/tests/test_release_importer.py
index 764174a3f78..0de358570b9 100644
--- a/nextcloudappstore/api/v1/tests/test_release_importer.py
+++ b/nextcloudappstore/api/v1/tests/test_release_importer.py
@@ -66,7 +66,7 @@ def test_import_minimal(self):
         self.assertEqual(0, release.shell_commands.count())
         self.assertEqual(0, release.shell_commands.count())
         self.assertEqual(1, release.licenses.count())
-        self.assertEqual("agpl", release.licenses.all()[0].id)
+        self.assertEqual("AGPL-3.0-or-later", release.licenses.all()[0].id)
         self.assertEqual(None, release.aa_is_system)
 
     def test_full(self):
@@ -230,7 +230,7 @@ def test_import_minimal(self):
         self.assertEqual(0, release.php_extensions.count())
         self.assertEqual(0, release.databases.count())
         self.assertEqual(0, release.shell_commands.count())
-        self.assertEqual("mit", release.licenses.all()[0].id)
+        self.assertEqual("MIT", release.licenses.all()[0].id)
         self.assertEqual(False, release.aa_is_system)
         self.assertEqual(1, release.deploy_methods.count())
         all_scopes = release.api_scopes.all()
@@ -275,7 +275,7 @@ def test_full(self):
         self.assertEqual("*", release.raw_php_version_spec)
         self._assert_all_empty(release, ["signature", "download"])
         self.assertEqual(1, release.licenses.count())
-        self.assertEqual("agpl", release.licenses.all()[0].id)
+        self.assertEqual("AGPL-3.0-or-later", release.licenses.all()[0].id)
         self.assertEqual(True, release.aa_is_system)
         self.assertEqual(1, release.deploy_methods.count())
         all_scopes = release.api_scopes.all()
diff --git a/nextcloudappstore/core/fixtures/licenses.json b/nextcloudappstore/core/fixtures/licenses.json
index 577e1596f58..61280911c01 100644
--- a/nextcloudappstore/core/fixtures/licenses.json
+++ b/nextcloudappstore/core/fixtures/licenses.json
@@ -1,4 +1,53 @@
 [
+    {
+        "model": "core.license",
+        "pk": "AGPL-3.0-only",
+        "fields": {
+            "name": "GNU Affero General Public License v3.0 only"
+        }
+    },
+    {
+        "model": "core.license",
+        "pk": "AGPL-3.0-or-later",
+        "fields": {
+            "name": "GNU Affero General Public License v3.0 or later"
+        }
+    },
+    {
+        "model": "core.license",
+        "pk": "Apache-2.0",
+        "fields": {
+            "name": "Apache License 2.0"
+        }
+    },
+    {
+        "model": "core.license",
+        "pk": "GPL-3.0-only",
+        "fields": {
+            "name": "GNU General Public License v3.0 only"
+        }
+    },
+    {
+        "model": "core.license",
+        "pk": "GPL-3.0-or-later",
+        "fields": {
+            "name": "GNU General Public License v3.0 or later"
+        }
+    },
+    {
+        "model": "core.license",
+        "pk": "MIT",
+        "fields": {
+            "name": "MIT License"
+        }
+    },
+    {
+        "model": "core.license",
+        "pk": "MPL-2.0",
+        "fields": {
+            "name": "Mozilla Public License 2.0"
+        }
+    },
     {
         "model": "core.license",
         "pk": "agpl",