diff --git a/.github/settings.yml b/.github/settings.yml
index 68fbb39..7361cdd 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -29,6 +29,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 2869131..c076436 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -420,6 +420,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
         dependencies:
           - "lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da5dc39..5e4b130 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 [`2.5.0...main`][2.5.0...main].
 
+### Added
+
+- Added support for PHP 8.4 ([#858]), by [@localheinz]
+
 ## [`2.5.0`][2.5.0]
 
 For a full diff see [`2.4.0...2.5.0`][2.4.0...2.5.0].
@@ -160,6 +164,7 @@ For a full diff see [`848192d...1.0.0`][848192d...1.0.0].
 [#537]: https://github.com/ergebnis/http-method/pull/537
 [#622]: https://github.com/ergebnis/http-method/pull/622
 [#693]: https://github.com/ergebnis/http-method/pull/693
+[#858]: https://github.com/ergebnis/http-method/pull/858
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz
diff --git a/composer.json b/composer.json
index 5887eaf..015ee53 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "security": "https://github.com/ergebnis/http-method/blob/main/.github/SECURITY.md"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.44.0",
diff --git a/composer.lock b/composer.lock
index 95a47cb..df7c9fa 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": "1a1f62b1ed664d2ebeb5464490bfa801",
+    "content-hash": "f43a065f04ce47d1911686cbdaf49d88",
     "packages": [],
     "packages-dev": [
         {
@@ -6494,13 +6494,13 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1.26"
     },