diff --git a/.github/settings.yml b/.github/settings.yml
index b86324e..2b76947 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -31,6 +31,8 @@ branches:
           - context: "Tests (8.2, lowest)"
           - context: "Tests (8.3, highest)"
           - context: "Tests (8.3, lowest)"
+          - context: "Tests (8.4, highest)"
+          - context: "Tests (8.4, lowest)"
         strict: false
       restrictions:
 
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 5f38e66..2f780e3 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -422,6 +422,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dacf97c..ff078e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ For a full diff see [`1.6.0...main`][1.6.0...main].
 
 - Added support for PHP 8.0 ([#926]), by [@localheinz]
 - Added support for PHP 7.4 ([#929]), by [@localheinz]
+- Added support for PHP 8.4 ([#987]), by [@tacman]
 
 ## [`1.6.0`][1.6.0]
 
@@ -188,6 +189,8 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
 [#926]: https://github.com/ergebnis/classy/pull/926
 [#929]: https://github.com/ergebnis/classy/pull/929
 [#930]: https://github.com/ergebnis/classy/pull/930
+[#987]: https://github.com/ergebnis/classy/pull/987
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz
+[@tacman]: https://github.com/tacman
diff --git a/composer.json b/composer.json
index e365ff3..dea1c17 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     "source": "https://github.com/ergebnis/classy"
   },
   "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",
     "ext-tokenizer": "*"
   },
   "require-dev": {
diff --git a/composer.lock b/composer.lock
index 91db836..278df0d 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": "e753fad8ed398c5c63b7551a4b3994ec",
+    "content-hash": "ad147e73732ba8e8eaede7f8db29f670",
     "packages": [],
     "packages-dev": [
         {
@@ -6396,7 +6396,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "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",
         "ext-tokenizer": "*"
     },
     "platform-dev": {},