diff --git a/.github/settings.yml b/.github/settings.yml
index 2e0de03..9da1e92 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 d6c50fd..86a1e58 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -443,6 +443,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c08619f..be94bc0 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.3.0...main`][4.3.0...main].
 
+### Added
+
+- Added support for PHP 8.4 ([#633]), by [@localheinz]
+
 ### Changed
 
 - Allowed installation of `justinrainbow/json-schema:^6.0.0` ([#632]), by [@localheinz]
@@ -164,5 +168,6 @@ For a full diff see [`dcd4cfb...1.0.0`][dcd4cfb...1.0.0].
 [#524]: https://github.com/ergebnis/json-schema-validator/pull/524
 [#610]: https://github.com/ergebnis/json-schema-validator/pull/610
 [#632]: https://github.com/ergebnis/json-schema-validator/pull/632
+[#633]: https://github.com/ergebnis/json-schema-validator/pull/633
 
 [@localheinz]: https://github.com/localheinz