diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9a903fe2fa6c05e74f63a06d18047fd8d9cd4f5d
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-67372-AllowEmptyAttributeSyntaxInFluidTagBuilder.rst
@@ -0,0 +1,27 @@
+==================================================================
+Feature: #67372 - Allow empty attribute syntax in fluid TagBuilder
+==================================================================
+
+Description
+===========
+
+Tags built with the TagBuilder may have empty attributes as they are allowed in the `HTML specifications`_ and are broadly supported by web browsers.
+The way to create empty attributes is to use ``->addAttribute($key, $value)`` or ``->addAttributes($array)`` just like before and provide an empty string as attribute value.
+
+
+Impact
+======
+
+If someone used an empty string as attribute value before, it will now be rendered with the empty attribute syntax which is exactly the same (according to the HTML specification).
+
+
+Examples
+========
+
+Usage example:
+
+.. code-block:: php
+
+	$this->tag->addAttribute('disabled', ''); // results in a tag like: <input disabled />
+
+.. _HTML specifications: http://www.w3.org/TR/html-markup/syntax.html#syntax-attributes
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
old mode 100644
new mode 100755
index 5e80f6cae700d1836a60edf0b0810aa602ebfe01..e55381f192ae773aed861b92f11f45726b0b7ad1
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractTagBasedViewHelper.php
@@ -80,7 +80,7 @@ abstract class AbstractTagBasedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelp
 
 		if (isset(self::$tagAttributes[get_class($this)])) {
 			foreach (self::$tagAttributes[get_class($this)] as $attributeName) {
-				if ($this->hasArgument($attributeName) && $this->arguments[$attributeName] !== '') {
+				if ($this->hasArgument($attributeName)) {
 					$this->tag->addAttribute($attributeName, $this->arguments[$attributeName]);
 				}
 			}
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
index 07f1e83855f25aedb780dad1ae6321d2a42fe682..dd7455af43f0801c82b9155c9b8b86932976a0c3 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
@@ -226,7 +226,11 @@ class TagBuilder {
 		}
 		$output = '<' . $this->tagName;
 		foreach ($this->attributes as $attributeName => $attributeValue) {
-			$output .= ' ' . $attributeName . '="' . $attributeValue . '"';
+			if ($attributeValue === '' && $GLOBALS['TSFE']->config['config']['doctype'] === 'html5') {
+				$output .= ' ' . $attributeName;
+			} else {
+				$output .= ' ' . $attributeName . '="' . $attributeValue . '"';
+			}
 		}
 		if ($this->hasContent() || $this->forceClosingTag) {
 			$output .= '>' . $this->content . '</' . $this->tagName . '>';
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
old mode 100644
new mode 100755
index 4d0f03b2af61da487a36cc5b897013b598c99278..561f9fdc49517f453ebfb2ecbc447af7b0de7e56
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractTagBasedViewHelperTest.php
@@ -50,6 +50,20 @@ class AbstractTagBasedViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 		$this->viewHelper->initialize();
 	}
 
+	/**
+	 * @test
+	 */
+	public function emptyTagAttributeCallsTagBuilder() {
+		$mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute'), array(), '', FALSE);
+		$mockTagBuilder->expects($this->once())->method('addAttribute')->with('foo', '');
+		$this->viewHelper->_set('tag', $mockTagBuilder);
+
+		$this->viewHelper->_call('registerTagAttribute', 'foo', 'string', 'Description', FALSE);
+		$arguments = array('foo' => '');
+		$this->viewHelper->setArguments($arguments);
+		$this->viewHelper->initialize();
+	}
+
 	/**
 	 * @test
 	 */
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
index 2b8c7dd9a762d0505516bf77967adb17b246a198..69fd80772e2dc808e627d8e8bb1f3339092a54f2 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/TagBuilderTest.php
@@ -112,6 +112,21 @@ class TagBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 		$this->assertEquals('<tag attribute1="attribute1value" attribute2="attribute2value" attribute3="attribute3value" />', $tagBuilder->render());
 	}
 
+	/**
+	 * @test
+	 */
+	public function emptyAttributesAreRenderedAccordingToHtmlDoctype() {
+		$GLOBALS['TSFE']->config['config']['doctype'] = 'html5';
+		$tagBuilder = new \TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder('tag');
+		$tagBuilder->addAttribute('attribute1', '');
+		$this->assertEquals('<tag attribute1 />', $tagBuilder->render(), 'Empty attribute syntax is used for HTML5 doctype');
+		$tagBuilder->reset();
+		$GLOBALS['TSFE']->config['config']['doctype'] = 'xhtml_trans';
+		$tagBuilder->setTagName('tag');
+		$tagBuilder->addAttribute('attribute1', '');
+		$this->assertEquals('<tag attribute1="" />', $tagBuilder->render(), 'Key value attribute syntax is used for XHTML doctype');
+	}
+
 	/**
 	 * @test
 	 */