diff --git a/composer.json b/composer.json
index d7166aebc07b283d307fa2463ca5ebd8dc70090a..33032c2436d3bd754bc405418ea3706e45ea1bc4 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
 		"psr/http-message": "~1.0",
 		"cogpowered/finediff": "~0.3.1",
 		"mso/idna-convert": "^1.1.0",
-		"typo3fluid/fluid": "^2.3",
+		"typo3fluid/fluid": "^2.4",
 		"guzzlehttp/guzzle": "^6.2.1",
 		"doctrine/dbal": "~2.5.4",
 		"nikic/php-parser": "~3.0.6"
diff --git a/composer.lock b/composer.lock
index 93bfa6968528b0b540f802010fb0608031f5da7c..e6e7a360fe0ffdaac61f3f2ae8abb5ad8ab76f54 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "fd66c8fafee6011bc40bcdbc0ae93d96",
+    "content-hash": "7b947207ce9e125821a010951e7061a2",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -1450,16 +1450,16 @@
         },
         {
             "name": "typo3fluid/fluid",
-            "version": "2.3.1",
+            "version": "2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/Fluid.git",
-                "reference": "117ea779232ff6299c5659e8ee3583509e851eca"
+                "reference": "f583badd3b2a90f046fe5c1e0459300325a3e0ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/117ea779232ff6299c5659e8ee3583509e851eca",
-                "reference": "117ea779232ff6299c5659e8ee3583509e851eca",
+                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/f583badd3b2a90f046fe5c1e0459300325a3e0ce",
+                "reference": "f583badd3b2a90f046fe5c1e0459300325a3e0ce",
                 "shasum": ""
             },
             "require": {
@@ -1485,7 +1485,7 @@
                 "LGPL-3.0"
             ],
             "description": "The TYPO3 Fluid template rendering engine",
-            "time": "2017-02-22T05:27:39+00:00"
+            "time": "2017-08-25T10:10:42+00:00"
         }
     ],
     "packages-dev": [
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-82230-FluidUpdates.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-82230-FluidUpdates.rst
new file mode 100644
index 0000000000000000000000000000000000000000..5e59481f439819249d9eef9f3b8d74222dcd6baa
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Important-82230-FluidUpdates.rst
@@ -0,0 +1,39 @@
+.. include:: ../../Includes.txt
+
+================================================================
+Important: #82230 - Updates to the Fluid template engine library
+================================================================
+
+See :issue:`82230`
+
+Description
+===========
+
+This article describes the changes that have been added to the Fluid template engine which is used in TYPO3.
+
+* Bug fix to evaluate negative numbers in conditions the same way PHP does
+* Bug fix for ``getLayoutPathAndFilename`` on ``TemplatePaths`` when property was manually set using setter
+* Bug fix to avoid issues with malformed cache identifiers
+* Bug fix to avoid attempting ``htmlspecialchars()`` on any values that are not string-compatible
+* Bug fix for adding namespaces to list of ignored namespaces
+* Bug fix to make casting of ints/floats consistent in attribute values and in array values
+* Bug fix to make internal cache of resolved ViewHelpers non-static to make sure it flushes between contexts
+* Bug fix for recursive file resolving
+* Performance bug fix to avoid loading compiled template classes that are already loaded
+* Performance bug fix to make ``f:render`` static callable from compiled templates
+* Performance bug fix to improve performance of uncompilable templates
+* New feature: support for ``hasMyProperty()`` as alternative to ``isMyProperty()`` when using ``{object.myProperty}``
+* New feature: ``ParserRuntimeOnly`` ViewHelper trait to use when ViewHelper only has functionality during parsing
+* New feature: ``ignoreEmptyAttributes()`` added to ``TagBuilder``, can be called in tag based ViewHelpers to skip
+  rendering of any attributes that evaluate to an empty string
+* New feature: support for ``AND`` and ``OR`` as alternatives to ``&&`` and ``||`` in boolean attributes like
+  ``condition`` on ``f:if``
+* New feature: support for custom error handling and a new implementation of a fault-tolerant error handler
+* New feature: methods ``getAll`` and ``addAll`` added to ``ViewHelperVariableContainer`` to allow getting and setting
+  all variables in a scope
+* New feature: concept of ``Renderable`` introduced. A ``Renderable`` is any class which implements
+  ``RenderableInterface`` - instances of such classes can be assigned as template variables and passed to ``f:render``
+
+Full list can be found on https://github.com/TYPO3/Fluid/compare/2.3.4...2.4.0
+
+.. index:: Fluid
\ No newline at end of file