diff --git a/admin_manual/configuration_user/instruction_set_for_apps.rst b/admin_manual/configuration_user/instruction_set_for_apps.rst
index c928a855c..1e9efbcaf 100644
--- a/admin_manual/configuration_user/instruction_set_for_apps.rst
+++ b/admin_manual/configuration_user/instruction_set_for_apps.rst
@@ -90,7 +90,7 @@ XML output
       <id>files</id>
       <name>Files</name>
       <description>File Management</description>
-      <licence>AGPL</licence>
+      <licence>AGPL-3.0-or-later</licence>
       <author>Robin Appelman</author>
       <require>4.9</require>
       <shipped>true</shipped>
diff --git a/developer_manual/app_development/info.rst b/developer_manual/app_development/info.rst
index c43d717d9..40a5f8ad5 100644
--- a/developer_manual/app_development/info.rst
+++ b/developer_manual/app_development/info.rst
@@ -23,12 +23,12 @@ A minimum valid **info.xml** would look like this:
         <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>
         <dependencies>
-            <nextcloud min-version="10"/>
+            <nextcloud min-version="31"/>
         </dependencies>
     </info>
 
@@ -47,7 +47,7 @@ A full blown example would look like this (needs to be utf-8 encoded):
         <description lang="en"># Description\nAn RSS/Atom feed reader</description>
         <description lang="de"><![CDATA[# Beschreibung\nEine Nachrichten App, welche mit [RSS/Atom](https://en.wikipedia.org/wiki/RSS) umgehen kann]]></description>
         <version>8.8.2</version>
-        <licence>agpl</licence>
+        <licence>AGPL-3.0-or-later</licence>
         <author mail="mail@provider.com" homepage="http://example.com">Bernhard Posselt</author>
         <author>Alessandro Cosentino</author>
         <author>Jan-Christoph Borchardt</author>
@@ -75,7 +75,7 @@ A full blown example would look like this (needs to be utf-8 encoded):
             <lib>curl</lib>
             <lib>SimpleXML</lib>
             <lib>iconv</lib>
-            <nextcloud min-version="9" max-version="10"/>
+            <nextcloud min-version="31" max-version="32"/>
         </dependencies>
         <background-jobs>
             <job>OCA\DAV\CardDAV\Sync\SyncJob</job>
@@ -175,7 +175,25 @@ version
 
 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/developer_manual/app_publishing_maintenance/publishing.rst b/developer_manual/app_publishing_maintenance/publishing.rst
index c5800637c..bbe902d25 100644
--- a/developer_manual/app_publishing_maintenance/publishing.rst
+++ b/developer_manual/app_publishing_maintenance/publishing.rst
@@ -31,7 +31,7 @@ These are the app guidelines an app has to comply with to have a chance to be ap
 Legal and security
 ^^^^^^^^^^^^^^^^^^
 
-* Apps must be licensed under AGPLv3+ or any compatible license.
+* Apps must be licensed under AGPL-3.0-or-later or any compatible license.
 * Apps must not use 'Nextcloud' in their name.
 * Irregular and unannounced security audits of all apps can and will take place.
 * If any indication of malicious intent or bad faith is found the developer(s) in question can count on a minimum 2 year ban from any Nextcloud infrastructure.
diff --git a/developer_manual/getting_started/coding_standards/index.rst b/developer_manual/getting_started/coding_standards/index.rst
index eca1738e6..8d232d177 100644
--- a/developer_manual/getting_started/coding_standards/index.rst
+++ b/developer_manual/getting_started/coding_standards/index.rst
@@ -95,8 +95,8 @@ The most part of Nextcloud is written in PHP, Typescript / JavaScript, so we hav
 License headers
 ---------------
 
-Nextcloud is licensed under the `GNU AGPLv3 <https://www.gnu.org/licenses/agpl>`_.
-From June, 16 2016 on we switched to "GNU AGPLv3 or any later version" for better long-term maintainability.
+Nextcloud is licensed under the `GNU Affero General Public License v3.0 <https://www.gnu.org/licenses/agpl>`_.
+From 16 June 2016, we switched to "GNU Affero General Public License v3.0 or later" for better long-term maintainability.
 
 If you create a new file please use this header: