diff --git a/admin_manual/installation/php_configuration.rst b/admin_manual/installation/php_configuration.rst
index 4159d6eff..5473f952c 100644
--- a/admin_manual/installation/php_configuration.rst
+++ b/admin_manual/installation/php_configuration.rst
@@ -129,4 +129,4 @@ You can search for a parameter with the following command: ``grep -r date.timezo
     /etc/php/8.3/cli/php.ini
 
 .. note:: Path names have to be set in respect of the installed PHP
-          (8.1, 8.2 or 8.3) as applicable.
+          (8.1, 8.2, 8.3 or 8.4) as applicable.
diff --git a/admin_manual/installation/system_requirements.rst b/admin_manual/installation/system_requirements.rst
index 692bd663f..f9f0620dd 100644
--- a/admin_manual/installation/system_requirements.rst
+++ b/admin_manual/installation/system_requirements.rst
@@ -35,6 +35,7 @@ For best performance, stability and functionality we have documented some recomm
 | PHP Runtime      | - 8.1 (*deprecated*)                                                  |
 |                  | - 8.2                                                                 |
 |                  | - **8.3** (*recommended*)                                             |
+|                  | - 8.4                                                                 |
 +------------------+-----------------------------------------------------------------------+
 
 See :doc:`source_installation` for minimum PHP-modules and additional software for installing Nextcloud.
diff --git a/admin_manual/release_notes/upgrade_to_31.rst b/admin_manual/release_notes/upgrade_to_31.rst
index 474c34f38..59f9532fd 100644
--- a/admin_manual/release_notes/upgrade_to_31.rst
+++ b/admin_manual/release_notes/upgrade_to_31.rst
@@ -6,6 +6,7 @@ System requirements
 -------------------
 
 * PHP 8.1 is now deprecated but still supported.
+* PHP 8.4 is now supported, but 8.3 is recommended.
 
 PHP configuration
 -----------------
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 e0e1da84d..1ccf78eb6 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.4" />
+    <php min-version="8.1" max-version="8.3" />
     <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.4"
+      "php": ">=8.1 <=8.3"
     }
   }
 
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 fa97f2c96..f7ce251ff 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
@@ -78,7 +78,7 @@ In that case the ``php``-dependencies entries can be omitted.
 
   <dependencies>
     <php min-version="8.1" max-version="8.4" />
-    <nextcloud min-version="26" max-version="28" />
+    <nextcloud min-version="29" max-version="31" />
   </dependencies>