diff --git a/.github/settings.yml b/.github/settings.yml
index 4c0bbbc..0d61eee 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 918aae3..30794e4 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 d02f371..3f4720f 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.2.0...main`][1.2.0...main].
 
+### Changed
+
+- Added support for PHP 8.4 ([#318]), by [@localheinz]
+
 ## [`1.2.0`][1.2.0]
 
 For a full diff see [`1.1.0...1.2.0`][1.1.0..1.2.0].
diff --git a/composer.json b/composer.json
index 7fb0232..511da71 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
     "security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md"
   },
   "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-json": "*"
   },
   "require-dev": {
diff --git a/composer.lock b/composer.lock
index 2423cab..50efa0a 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": "c3862d19c0ef15fbf85bfb552361eb46",
+    "content-hash": "35375cd96aaad4c90152bf6228ab0d89",
     "packages": [],
     "packages-dev": [
         {
@@ -6654,7 +6654,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-json": "*"
     },
     "platform-dev": [],