diff --git a/.github/settings.yml b/.github/settings.yml
index 22f1608..f6c11bf 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -31,6 +31,9 @@ branches:
           - context: "Tests (8.3, highest)"
           - context: "Tests (8.3, locked)"
           - context: "Tests (8.3, lowest)"
+          - context: "Tests (8.4, highest)"
+          - context: "Tests (8.4, locked)"
+          - context: "Tests (8.4, lowest)"
         strict: false
       restrictions:
 
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index b3ade3a..e3f1d74 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -472,6 +472,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
@@ -508,6 +509,10 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-"
 
+      - name: "Remove incompatible dependencies with composer"
+        if: "matrix.dependencies != 'locked'"
+        run: "composer remove roave/backward-compatibility-check --ansi --dev --no-interaction --no-progress"
+
       - name: "Remove platform configuration with composer"
         if: "matrix.dependencies != 'locked'"
         run: "composer config platform.php --ansi --unset"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b222d7..a22aa7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 For a full diff see [`1.0.0...main`][1.0.0...main].
 
+### Added
+
+- Added support for PHP 8.4 ([#146]), by [@localheinz]
+
 ## [`1.0.0`][1.0.0]
 
 For a full diff see [`f4208b3...1.0.0`][f4208b3...1.0.0].
@@ -28,5 +32,6 @@ For a full diff see [`f4208b3...1.0.0`][f4208b3...1.0.0].
 [#2]: https://github.com/ergebnis/data-generator/pull/2
 [#3]: https://github.com/ergebnis/data-generator/pull/3
 [#4]: https://github.com/ergebnis/data-generator/pull/4
+[#146]: https://github.com/ergebnis/data-generator/pull/146
 
 [@localheinz]: https://github.com/localheinz
diff --git a/composer.json b/composer.json
index c2c1575..e39d9a8 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "security": "https://github.com/ergebnis/data-generator/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.44.0",
diff --git a/composer.lock b/composer.lock
index 05bd92c..803899f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9e97d463c43a73584873d2b6f084a970",
+    "content-hash": "95a4a5ec7831872535bcfef9ccf017bd",
     "packages": [],
     "packages-dev": [
         {
@@ -7430,13 +7430,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1.26"
     },