diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index dbcba3c..633498c 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -202,11 +202,12 @@ Options:
             - 15    maintained until 2027-11-11
             - 16    maintained until 2028-11-09
 
-    -p <8.1|8.2|8.3>
+    -p <8.1|8.2|8.3|8.4>
         Specifies the PHP minor version to be used
             - 8.1: (default) use PHP 8.1
             - 8.2: use PHP 8.2
             - 8.3: use PHP 8.3
+            - 8.4: use PHP 8.4
 
     -x
         Only with -s functional|unit
@@ -291,7 +292,7 @@ while getopts "a:b:d:i:s:p:xy:nhu" OPT; do
             ;;
         p)
             PHP_VERSION=${OPTARG}
-            if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3)$ ]]; then
+            if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3|8.4)$ ]]; then
                 INVALID_OPTIONS+=("p ${OPTARG}")
             fi
             ;;
diff --git a/ChangeLog b/ChangeLog
index 6483c57..7e891db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-12-07 Francois Suter (Idéative)  <typo3@ideative.ch>
+
+    * Verify compatibility with PHP 8.4
+
 2024-11-26 Francois Suter (Idéative)  <typo3@ideative.ch>
 
     * Verify compatibility with TYPO3 13 ELTS, resolves #28
diff --git a/Makefile b/Makefile
index 9da27d3..f995272 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,9 @@ test-cgl: ## Fix PHP coding styles
 test-unit-8-1: ## Run unit tests with PHP 8.1 (lowest)
 	Build/Scripts/runTests.sh -s unit -p 8.1
 
-.PHONY: test-unit-8-3
+.PHONY: test-unit-8-4
 test-unit-8-3: ## Run unit tests with PHP 8.3 (highest supported by TYPO3 11)
-	Build/Scripts/runTests.sh -s unit -p 8.3
+	Build/Scripts/runTests.sh -s unit -p 8.4
 
 .PHONY: test-unit
 test-unit: test-unit-8-1 test-unit-8-3## Run unit tests with PHP 8.1 and 8.3
@@ -45,9 +45,9 @@ test-unit: test-unit-8-1 test-unit-8-3## Run unit tests with PHP 8.1 and 8.3
 test-functional-8-1: ## Run functional tests with PHP 8.1 and mariadb (lowest)
 	Build/Scripts/runTests.sh -s functional -p 8.1 -d mysql
 
-.PHONY: test-functional-8-3
+.PHONY: test-functional-8-4
 test-functional-8-3: ## Run functional tests with PHP 8.3 and mariadb (highest supported by TYPO3 11)
-	Build/Scripts/runTests.sh -s functional -p 8.3 -d mysql
+	Build/Scripts/runTests.sh -s functional -p 8.4 -d mysql
 
 .PHONY: test-functional
 test-functional: test-functional-8-1 test-functional-8-3## Run functional tests with PHP 8.1 and 8.3
diff --git a/composer.json b/composer.json
index 645ad85..93f3d3f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 		}
 	},
 	"require": {
-		"php": "^8.1 || ^8.2 || ^8.3",
+		"php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
 		"ext-simplexml": "*",
 		"typo3/coding-standards": "*",
 		"typo3/cms-core": "^12.4 || ^13.4"