diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f759c31..87cfb4f 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:
@@ -36,6 +36,7 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -59,7 +60,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:
@@ -134,12 +135,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.0'
           - db-version: '8'
             php-version: '8.3'
             typo3-version: '^13.0'
+          - db-version: '8'
+            php-version: '8.4'
+            typo3-version: '^13.0'
     steps:
       - uses: actions/checkout@v3
 
@@ -204,10 +211,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.0'
+            typo3-version: '^13.4'
           - php-version: '8.3'
-            typo3-version: '^13.0'
+            typo3-version: '^13.4'
+          - php-version: '8.4'
+            typo3-version: '^13.4'
     steps:
       - uses: actions/checkout@v3
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 108e787..dd89006 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.6.0 - 2025-03-04
+
+### Added
+
+- Support for PHP 8.4.
+
 ## v1.5.0 - 2024-02-05
 
 ### Added
diff --git a/composer.json b/composer.json
index 1c6ecb8..39bfcc0 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "bin/typo3-php-datasets"
     ],
     "require": {
-        "php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3",
+        "php": "^7.2 || ^7.3 || ^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
         "composer-runtime-api": "^2.2",
         "doctrine/dbal": "^2.13 || ^3.6 || ^4.0 || 4.0.0-RC2",
         "symfony/console": "^5.4 || ^6.2 || ^7.0",