diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.rst
index 1ccf78eb6..e0e1da84d 100644
--- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.rst
+++ b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.rst
@@ -134,7 +134,7 @@ In this release support for PHP 8.0 was removed. Follow the steps below to make
 .. code-block:: xml
 
   <dependencies>
-    <php min-version="8.1" max-version="8.3" />
+    <php min-version="8.1" max-version="8.4" />
     <nextcloud min-version="27" max-version="30" />
   </dependencies>
 
@@ -145,7 +145,7 @@ In this release support for PHP 8.0 was removed. Follow the steps below to make
 
   {
     "require": {
-      "php": ">=8.1 <=8.3"
+      "php": ">=8.1 <=8.4"
     }
   }
 
diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_31.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_31.rst
index abb637200..fa97f2c96 100644
--- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_31.rst
+++ b/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_31.rst
@@ -65,6 +65,39 @@ Removed APIs
 Back-end changes
 ----------------
 
+Support for PHP 8.4 added
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In this release support for PHP 8.4 was added. 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.4.
+However, it is recommended to always support all PHP versions that are compatible with supported Nextcloud version.
+In that case the ``php``-dependencies entries can be omitted.
+
+.. code-block:: xml
+
+  <dependencies>
+    <php min-version="8.1" max-version="8.4" />
+    <nextcloud min-version="26" max-version="28" />
+  </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": ">=8.1 <=8.4"
+    }
+  }
+
+3. If you have :ref:`continuous integration <app-ci>` set up, extend your test matrix with PHP 8.4 tests and linters.
+This happens automatically when you reuse our `GitHub Workflow templates <https://github.com/nextcloud/.github>`__,
+but you can also use the underlying `icewind1991/nextcloud-version-matrix Action <https://github.com/icewind1991/nextcloud-version-matrix>`__ directly.
+
+Information about code changes can be found on `php.net <https://www.php.net/migration84>`__ and `stitcher.io <https://stitcher.io/blog/new-in-php-84>`__.
+
 Added APIs
 ^^^^^^^^^^