diff --git a/composer.json b/composer.json
index 12a693db93eeebcb772e315da06de3a3b6bdaa5a..686af92fe7958a3024dd59ae7a47aa94619ad2b9 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,7 @@
 		"psr/http-message": "~1.0",
 		"cogpowered/finediff": "~0.3.1",
 		"mso/idna-convert": "^1.1.0",
-		"typo3fluid/fluid": "^2.2",
+		"typo3fluid/fluid": "^2.3",
 		"guzzlehttp/guzzle": "^6.2.1",
 		"doctrine/dbal": "~2.5.4"
 	},
diff --git a/composer.lock b/composer.lock
index 9e2ed605bd993aa68be733788925e1567bda2ce7..1ef387a872d9b8fb1e8f64e964501211c87d5119 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": "1fe12bb655c3cb1c01ee8d0e5b945e1e",
+    "content-hash": "6fb40f5d3132ade2aa56de27e94b7c03",
     "packages": [
         {
             "name": "cogpowered/finediff",
@@ -1363,16 +1363,16 @@
         },
         {
             "name": "typo3fluid/fluid",
-            "version": "2.2.0",
+            "version": "2.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/Fluid.git",
-                "reference": "48e434663ec3844bd8f8f91f8fa33587b1a643e2"
+                "reference": "117ea779232ff6299c5659e8ee3583509e851eca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/48e434663ec3844bd8f8f91f8fa33587b1a643e2",
-                "reference": "48e434663ec3844bd8f8f91f8fa33587b1a643e2",
+                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/117ea779232ff6299c5659e8ee3583509e851eca",
+                "reference": "117ea779232ff6299c5659e8ee3583509e851eca",
                 "shasum": ""
             },
             "require": {
@@ -1398,7 +1398,7 @@
                 "LGPL-3.0"
             ],
             "description": "The TYPO3 Fluid template rendering engine",
-            "time": "2017-01-18T15:34:20+00:00"
+            "time": "2017-02-22T05:27:39+00:00"
         }
     ],
     "packages-dev": [
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Important-79847-FluidBugsFixedAndFeaturesAdded.rst b/typo3/sysext/core/Documentation/Changelog/master/Important-79847-FluidBugsFixedAndFeaturesAdded.rst
new file mode 100644
index 0000000000000000000000000000000000000000..fc80b809f5a1146a9d2251ee3d3d7a2bb76ef194
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Important-79847-FluidBugsFixedAndFeaturesAdded.rst
@@ -0,0 +1,37 @@
+.. include:: ../../Includes.txt
+
+=====================================================================
+Important: #79847 - Fluid bugs fixed and features added (Fluid 2.3.1)
+=====================================================================
+
+See :issue:`79847`
+
+Description
+===========
+
+The Fluid engine dependency is raised to version 2.3.1 which fixes a few important bugs and adds a couple of features:
+
+* Namespace declarations (``{namespace foo=Bar\Baz\ViewHelpers}`` style) are now removed from output
+  https://github.com/TYPO3/Fluid/pull/262
+* The TemplatePaths object now accepts arrays for ``sanitizePath`` like the TYPO3 CMS adapter does.
+  https://github.com/TYPO3/Fluid/pull/263
+* Compiler is reset after each rendering - this fixes an issue where rendering the new ``HeaderAssets`` and ``FooterAssets``
+  sections would fail to attach the assets until the Fluid template had been compiled (first page hit after cache flush).
+  https://github.com/TYPO3/Fluid/pull/269
+
+And in the new features department, two new features are added:
+
+* XML namespace extraction is brought into sync with TYPO3 CMS adapter
+  https://github.com/TYPO3/Fluid/pull/264
+* An escaping modifier pre-processor has been added
+  https://github.com/TYPO3/Fluid/pull/266
+
+This means two things:
+
+1. For template developers this means you can use ``{escaping off}`` in a template to completely disable the escaping
+   which is normally done - which can be particularly helpful in non-HTML templates.
+2. For the TYPO3 core this means it becomes possible to drop two classes (Fluid overrides) completely from the source;
+   namely the ``XmlnsNamespaceTemplatePreProcessor`` and ``LegacyNamespaceExpressionNode``. Thus increasing the parsing
+   efficiency of Fluid as it is integrated with TYPO3 CMS.
+
+.. index:: Fluid