diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c070111..c99519e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
   code-quality:
     name: "Code quality checks"
     runs-on: ubuntu-24.04
@@ -205,6 +206,12 @@ jobs:
           - typo3-version: "^12.4"
             php-version: "8.3"
             composer-dependencies: highest
+          - typo3-version: "^12.4"
+            php-version: "8.4"
+            composer-dependencies: lowest
+          - typo3-version: "^12.4"
+            php-version: "8.4"
+            composer-dependencies: highest
   functional-tests:
     name: "Functional tests"
     runs-on: ubuntu-24.04
@@ -313,3 +320,9 @@ jobs:
           - typo3-version: "^12.4"
             php-version: "8.3"
             composer-dependencies: highest
+          - typo3-version: "^12.4"
+            php-version: "8.4"
+            composer-dependencies: lowest
+          - typo3-version: "^12.4"
+            php-version: "8.4"
+            composer-dependencies: highest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bdde12..dc9ce0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Added
 
+- Add support for PHP 8.4 (#725)
+
 ### Changed
 
 - Require TYPO3 >= 11.5.40 (#692, #726)
diff --git a/composer.json b/composer.json
index 77bda55..95c3f00 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
 		"source": "https://github.com/oliverklee/ext-feuserextrafields"
 	},
 	"require": {
-		"php": "^7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+		"php": "^7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
 		"typo3/cms-core": "^11.5.40 || ^12.4.21",
 		"typo3/cms-extbase": "^11.5.40 || ^12.4.21"
 	},
diff --git a/ext_emconf.php b/ext_emconf.php
index d5d57ec..735f8e5 100755
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -7,7 +7,7 @@
     'category' => 'misc',
     'constraints' => [
         'depends' => [
-            'php' => '7.4.0-8.3.99',
+            'php' => '7.4.0-8.4.99',
             'typo3' => '11.5.40-12.4.99',
             'extbase' => '11.5.40-12.4.99',
         ],
diff --git a/rector.php b/rector.php
index 8b4673a..59f126d 100644
--- a/rector.php
+++ b/rector.php
@@ -94,7 +94,7 @@
     ])
     ->withImportNames(true, true, false)
     ->withConfiguredRule(ExtEmConfRector::class, [
-        ExtEmConfRector::PHP_VERSION_CONSTRAINT => '7.4.0-8.3.99',
+        ExtEmConfRector::PHP_VERSION_CONSTRAINT => '7.4.0-8.4.99',
         ExtEmConfRector::TYPO3_VERSION_CONSTRAINT => '11.5.40-12.4.99',
         ExtEmConfRector::ADDITIONAL_VALUES_TO_BE_REMOVED => [],
     ])