diff --git a/.github/settings.yml b/.github/settings.yml
index d8dbe49..4d3a400 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -36,6 +36,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 49c0100..0cb94e8 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -428,6 +428,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bec8a9..303474f 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 [`3.6.0...main`][3.6.0...main].
 
+### Added
+
+- Added support for PHP 8.4 ([#863]), by [@localheinz]
+
 ## [`3.6.0`][3.6.0]
 
 For a full diff see [`3.5.0...3.6.0`][3.5.0...3.6.0].
@@ -201,6 +205,7 @@ For a full diff see [`8849fc6...1.0.0`][8849fc6...1.0.0].
 [#752]: https://github.com/ergebnis/json-printer/pull/752
 [#753]: https://github.com/ergebnis/json-printer/pull/753
 [#841]: https://github.com/ergebnis/json-printer/pull/841
+[#863]: https://github.com/ergebnis/json-printer/pull/863
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz