diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst
index f82138cff..bd056a6ff 100644
--- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst
+++ b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst
@@ -7,13 +7,52 @@ Upgrade to Nextcloud 24
 General
 -------
 
-tbd
+info.xml
+^^^^^^^^
+
+Make sure your ``appinfo/info.xml`` allows for Nextcloud 24.
+
+.. code-block:: xml
+
+	<dependencies>
+	  <nextcloud min-version="21" max-version="24" />
+	</dependencies>
 
 Front-end changes
 -----------------
 
 tbd
 
+
+PHP8.1
+------
+
+Nextcloud 24 is the first major Nextcloud release to work with PHP8.1. Follow the steps below to make your app compatible.
+
+1. If ``appinfo/info.xml`` has a dependency specification for PHP, increase the ``max-version`` to 8.1.
+
+.. code-block:: xml
+
+  <dependencies>
+    <php min-version="7.3" max-version="8.1" />
+    <nextcloud min-version="21" max-version="24" />
+  </dependencies>
+
+
+2. If your app has a ``composer.json`` and the file contains the PHP restrictions from ``info.xml``, adjust it as well.
+
+.. code-block:: json
+
+  {
+    "require": {
+      "php": ">=7.3 <=8.1"
+    }
+  }
+
+3. If you have :ref:`continuous integration <app-ci>` set up, extend your test matrix with PHP8.1 tests and linters.
+
+Information about code changes can be found on `php.net <https://www.php.net/migration81>`__ and `stitcher.io <https://stitcher.io/blog/new-in-php-81#breaking-changes>`__.
+
 Back-end changes
 ----------------