diff --git a/.github/settings.yml b/.github/settings.yml
index 860fbf34..7eacab23 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 30a5bbfd..9f9cdf58 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -444,6 +444,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 868b7b2e..dda1a0a0 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 [`4.6.0...main`][4.6.0...main].
 
+### Added
+
+- Added support for PHP 8.4 ([#1195]), by [@localheinz]
+
 ## [`4.6.0`][4.6.0]
 
 For a full diff see [`4.5.0...4.6.0`][4.5.0...4.6.0].
@@ -709,6 +713,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#1077]: https://github.com/ergebnis/json-normalizer/pull/1077
 [#1079]: https://github.com/ergebnis/json-normalizer/pull/1079
 [#1171]: https://github.com/ergebnis/json-normalizer/pull/1171
+[#1195]: https://github.com/ergebnis/json-normalizer/pull/1195
 
 [@alexis-saransig-lullabot]: https://github.com/alexis-saransig-lullabot
 [@BackEndTea]: https://github.com/BackEndTea