diff --git a/composer.json b/composer.json
index f214857f2124e6394e054eb335a0430b60040f65..40b13db68b43de5998965293b689e4cf6726efaa 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
 		"typo3/cms-cli": "^2.0",
 		"typo3/cms-composer-installers": "^2.0",
 		"typo3/phar-stream-wrapper": "^3.1.2",
-		"typo3fluid/fluid": "^2.6.1",
+		"typo3fluid/fluid": "^2.6.4",
 		"webmozart/assert": "^1.0"
 	},
 	"require-dev": {
diff --git a/composer.lock b/composer.lock
index ba1291abcd26e64f5175f970dfcbf5c20222ddf6..255273f0bbeaf1045b3a166c9589b09334d15c3b 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": "504d732795cef3c4078aa9f9587ff3dd",
+    "content-hash": "f2fe7c52b1352fc018455fec38f1eedc",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -3177,16 +3177,16 @@
         },
         {
             "name": "typo3fluid/fluid",
-            "version": "2.6.1",
+            "version": "2.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/Fluid.git",
-                "reference": "9ef6a8ffff2e812025fc0701b4ce72eea6911a3d"
+                "reference": "75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/9ef6a8ffff2e812025fc0701b4ce72eea6911a3d",
-                "reference": "9ef6a8ffff2e812025fc0701b4ce72eea6911a3d",
+                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80",
+                "reference": "75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80",
                 "shasum": ""
             },
             "require": {
@@ -3195,7 +3195,7 @@
             "require-dev": {
                 "mikey179/vfsstream": "^1.6",
                 "php-coveralls/php-coveralls": "^2.1",
-                "phpunit/phpunit": "^4.8",
+                "phpunit/phpunit": "^8.1",
                 "squizlabs/php_codesniffer": "^2.7"
             },
             "bin": [
@@ -3212,7 +3212,7 @@
                 "LGPL-3.0-or-later"
             ],
             "description": "The TYPO3 Fluid template rendering engine",
-            "time": "2019-05-07T07:07:18+00:00"
+            "time": "2019-09-13T09:38:15+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/typo3/sysext/adminpanel/composer.json b/typo3/sysext/adminpanel/composer.json
index 339e6d0c20dbb287cb834297cb2ac80f9e149090..01d0a00a250e7509c33950d1bb2c5ad220692c00 100644
--- a/typo3/sysext/adminpanel/composer.json
+++ b/typo3/sysext/adminpanel/composer.json
@@ -17,7 +17,7 @@
 		"typo3/cms-core": "10.1.*@dev",
 		"typo3/cms-fluid": "10.1.*@dev",
 		"typo3/cms-frontend": "10.1.*@dev",
-		"typo3fluid/fluid": "^2.6.1",
+		"typo3fluid/fluid": "^2.6.4",
 		"psr/http-message": "~1.0",
 		"psr/http-server-handler": "^1.0",
 		"psr/http-server-middleware": "^1.0"
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 2149bc86a2e09d77c99c966a4a9f888e628151a4..9ae259f8b633fdb7d1044a08e41986ec013f8ef3 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -49,7 +49,7 @@
 		"typo3/cms-cli": "^2.0",
 		"typo3/cms-composer-installers": "^2.0",
 		"typo3/phar-stream-wrapper": "^3.1.2",
-		"typo3fluid/fluid": "^2.6.1"
+		"typo3fluid/fluid": "^2.6.4"
 	},
 	"require-dev": {
 		"codeception/codeception": "^2.5.4 || ^3",
diff --git a/typo3/sysext/fluid/composer.json b/typo3/sysext/fluid/composer.json
index 92d82d59c255ac5a6ed2ea8bafa513c11f93e850..e0128cccd7c32f9c2ff3f6b43992e1a8ed508cd6 100644
--- a/typo3/sysext/fluid/composer.json
+++ b/typo3/sysext/fluid/composer.json
@@ -16,7 +16,7 @@
 		"symfony/dependency-injection": "^4.1",
 		"typo3/cms-core": "10.1.*@dev",
 		"typo3/cms-extbase": "10.1.*@dev",
-		"typo3fluid/fluid": "^2.6.1"
+		"typo3fluid/fluid": "^2.6.4"
 	},
 	"conflict": {
 		"typo3/cms": "*"
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index f104538a3f1214d8f04c6e1bd7d10435afdb52bd..b3ba974d74335847a11e1103bb5d547658c519b1 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -15,7 +15,7 @@
 	"require": {
 		"typo3/cms-backend": "10.1.*@dev",
 		"typo3/cms-core": "10.1.*@dev",
-		"typo3fluid/fluid": "^2.6.1"
+		"typo3fluid/fluid": "^2.6.4"
 	},
 	"conflict": {
 		"typo3/cms": "*"