diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 81803b4..ad37426 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           coverage: none
           tools: composer:v2
         env:
@@ -32,6 +32,7 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -55,7 +56,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           coverage: none
           tools: composer:v2
         env:
@@ -84,7 +85,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: "8.3"
           coverage: none
           tools: composer:v2
         env:
@@ -112,12 +113,18 @@ jobs:
           - db-version: '8'
             php-version: '8.3'
             typo3-version: '^12.4'
+          - db-version: '8'
+            php-version: '8.4'
+            typo3-version: '^12.4'
           - db-version: '8'
             php-version: '8.2'
-            typo3-version: '^13.3'
+            typo3-version: '^13.4'
           - db-version: '8'
             php-version: '8.3'
-            typo3-version: '^13.3'
+            typo3-version: '^13.4'
+          - db-version: '8'
+            php-version: '8.4'
+            typo3-version: '^13.4'
     steps:
       - uses: actions/checkout@v4
 
@@ -166,10 +173,14 @@ jobs:
             typo3-version: '^12.4'
           - php-version: '8.3'
             typo3-version: '^12.4'
+          - php-version: '8.4'
+            typo3-version: '^12.4'
           - php-version: '8.2'
-            typo3-version: '^13.3'
+            typo3-version: '^13.4'
           - php-version: '8.3'
-            typo3-version: '^13.3'
+            typo3-version: '^13.4'
+          - php-version: '8.4'
+            typo3-version: '^13.4'
     steps:
       - uses: actions/checkout@v4
 
diff --git a/Documentation/Changelog/3.1.0.rst b/Documentation/Changelog/3.1.0.rst
new file mode 100644
index 0000000..d9cf5fc
--- /dev/null
+++ b/Documentation/Changelog/3.1.0.rst
@@ -0,0 +1,27 @@
+3.1.0
+=====
+
+Breaking
+--------
+
+Nothing
+
+Features
+--------
+
+* Add support for PHP 8.4.
+
+Fixes
+-----
+
+Nothing
+
+Tasks
+-----
+
+Nothing
+
+Deprecation
+-----------
+
+Nothing
diff --git a/composer.json b/composer.json
index d6bfe87..7225d03 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         }
     },
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-mbstring": "*",
         "doctrine/dbal": "^2.12 || ^3.3 || ^4.0",
         "psr/http-message": "^1.0",
diff --git a/shell.nix b/shell.nix
index 18bfdad..f2f09c1 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  php = phps.packages.x86_64-linux.php83.buildEnv {
+  php = phps.packages.x86_64-linux.php84.buildEnv {
     extensions = { enabled, all }: enabled ++ (with all; [
       xdebug
     ]);