diff --git a/.gitignore b/.gitignore
index f589cd9..ed29545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /.php_cs.cache
 composer.lock
 /nbproject
+/var
diff --git a/.travis.yml b/.travis.yml
index 6bc1a8b..e749540 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,9 @@ script:
 
 jobs:
   include:
+  - stage: test
+    php: "7.2"
+    env: TYPO3=^9.5
   - stage: test
     php: "7.2"
     env: TYPO3=^8.7
@@ -63,6 +66,9 @@ jobs:
   - stage: test
     php: "7.0"
     env: TYPO3=^8.7
+  - stage: test
+    php: "7.2"
+    env: TYPO3=^9.5 DEPENDENCIES_PREFERENCE="--prefer-lowest"
   - stage: test
     php: "7.2"
     env: TYPO3=^8.7 DEPENDENCIES_PREFERENCE="--prefer-lowest"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4498cf0..920cfde 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ## x.y.z
 
 ### Added
+- Add support for TYPO3 9.6 (#48)
 - Add PHP_CodeSniffer to the Travis CI build (#44,#46)
 - Auto-release to the TER (#34)
 - Composer script for PHP linting
diff --git a/composer.json b/composer.json
index 93f137e..5a9cf2d 100644
--- a/composer.json
+++ b/composer.json
@@ -27,13 +27,13 @@
     },
     "require": {
         "php": "~7.0 || ~7.1 || ~7.2",
-        "typo3/cms-core": "^8.7.10",
-        "typo3/cms-extbase": "^8.7",
-        "typo3/cms-fluid": "^8.7",
-        "typo3/cms-frontend": "^8.7"
+        "typo3/cms-core": "^8.7.10 || ^9.5.4",
+        "typo3/cms-extbase": "^8.7 || ^9.5",
+        "typo3/cms-fluid": "^8.7 || ^9.5",
+        "typo3/cms-frontend": "^8.7 || ^9.5"
     },
     "require-dev": {
-        "typo3/cms-fluid-styled-content": "^8.7",
+        "typo3/cms-fluid-styled-content": "^8.7 || ^9.5",
         "helhum/typo3-composer-setup": "^0.5.4",
         "squizlabs/php_codesniffer": "^3.4.2",
         "helmich/typo3-typoscript-lint": "^1.5.0",
diff --git a/ext_emconf.php b/ext_emconf.php
index c904a16..5dbf20a 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -7,7 +7,7 @@ $EM_CONF[$_EXTKEY] = [
     'constraints' => [
         'depends' => [
             'php' => '7.0.0-7.2.99',
-            'typo3' => '8.7.0-8.7.99',
+            'typo3' => '8.7.0-9.5.99',
         ],
     ],
     'state' => 'stable',