diff --git a/autotests/folding/test.mustache.fold b/autotests/folding/test.mustache.fold
--- a/autotests/folding/test.mustache.fold
+++ b/autotests/folding/test.mustache.fold
@@ -106,5 +106,10 @@
         {{> myPartial}}
     <endfold id='6'>{{/each}}</endfold id='6'>
 
+    <beginfold id='24'><!--</beginfold id='24'> Delimiters in tags (folding) <endfold id='24'>--></endfold id='24'>
+    word<beginfold id='10'><div</beginfold id='10'>>word
+
+    word<endfold id='10'></div</endfold id='10'>>word
+
     </body>
 </html>
diff --git a/autotests/html/test.mustache.html b/autotests/html/test.mustache.html
--- a/autotests/html/test.mustache.html
+++ b/autotests/html/test.mustache.html
@@ -112,6 +112,11 @@
         <span style="color:#0057ae;">{{&gt;</span><span style="color:#924c9d;"> myPartial</span><span style="color:#0057ae;">}}</span>
     <span style="color:#644a9b;font-weight:bold;">{{/each}}</span>
 
+    <span style="color:#898887;">&lt;!-- Delimiters in tags (folding) --&gt;</span>
+    word<span style="font-weight:bold;">&lt;div&gt;</span>word
+
+    word<span style="font-weight:bold;">&lt;/div&gt;</span>word
+
     <span style="font-weight:bold;">&lt;/body&gt;</span>
 <span style="font-weight:bold;">&lt;/html&gt;</span>
 </pre></body></html>
diff --git a/autotests/input/test.mustache b/autotests/input/test.mustache
--- a/autotests/input/test.mustache
+++ b/autotests/input/test.mustache
@@ -106,5 +106,10 @@
         {{> myPartial}}
     {{/each}}
 
+    <!-- Delimiters in tags (folding) -->
+    word<div>word
+
+    word</div>word
+
     </body>
 </html>
diff --git a/autotests/reference/test.mustache.ref b/autotests/reference/test.mustache.ref
--- a/autotests/reference/test.mustache.ref
+++ b/autotests/reference/test.mustache.ref
@@ -106,5 +106,10 @@
 <Normal Text>        </Normal Text><Mustache Variable>{{></Mustache Variable><Mustache Partial> myPartial</Mustache Partial><Mustache Variable>}}</Mustache Variable><br/>
 <Normal Text>    </Normal Text><Mustache Block>{{/each}}</Mustache Block><br/>
 <Normal Text></Normal Text><br/>
+<Normal Text>    </Normal Text><Comment><!-- Delimiters in tags (folding) --></Comment><br/>
+<Normal Text>    word</Normal Text><Element Tag><div></Element Tag><Normal Text>word</Normal Text><br/>
+<Normal Text></Normal Text><br/>
+<Normal Text>    word</Normal Text><Element Tag></div></Element Tag><Normal Text>word</Normal Text><br/>
+<Normal Text></Normal Text><br/>
 <Normal Text>    </Normal Text><Element Tag></body></Element Tag><br/>
 <Element Tag></html></Element Tag><br/>
diff --git a/data/syntax/mustache.xml b/data/syntax/mustache.xml
--- a/data/syntax/mustache.xml
+++ b/data/syntax/mustache.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE language SYSTEM "language.dtd"
 [
 	<!ENTITY name          "[A-Za-z_:][\w.:_-]*">
-	<!ENTITY attributeName "(\s|^)[A-Za-z_:\*#\(\[][\)\]\w\.:_-]*">
-	<!ENTITY entref        "&amp;(#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
-	<!ENTITY tag           "&lt;\s*(&name;|&gt;)">
+	<!ENTITY attributeName "(?:\s|^)[A-Za-z_:\*#\(\[][\)\]\w\.:_-]*">
+	<!ENTITY entref        "&amp;(?:#[0-9]+|#[xX][0-9A-Fa-f]+|&name;);">
+	<!ENTITY tag           "&lt;\s*(?:&name;|&gt;)">
 	<!-- Handlebars identifier -->
-	<!ENTITY identifier    "([a-zA-Z_$:\?]|[^[:ascii:]])([\w$:\?\-]|[^[:ascii:]])*">
+	<!ENTITY identifier    "(?:[a-zA-Z_$:\?]|[^[:ascii:]])(?:[\w$:\?\-]|[^[:ascii:]])*">
 ]>
 
 <!--
@@ -36,12 +36,13 @@
     (via IncludeRules) in the HTML highlighter.
 
     Change log:
+     * v3 [2019-10-03]: Minor fixes.
      * v2 [2019-02-24]: Also highlight template files (HTML).
                         Improve support for Handlebars.
      * v1 [2019-02-10]: Initial version
 -->
 
-<language name="Mustache/Handlebars (HTML)" version="2" kateversion="5.0"
+<language name="Mustache/Handlebars (HTML)" version="3" kateversion="5.44"
           section="Markup" priority="1" mimetype=""
           extensions="*.mustache;*.handlebars;*.hbs;*.ractive;*.hogan;*.hulk;*.html.mst;*.html.mu;*.html.rac"
           author="Nibaldo González (nibgonz@gmail.com), based on the HTML highlighter by Wilbert Berendsen (wilbert@kde.nl)"
@@ -85,7 +86,7 @@
 			<!-- For helpers (not included because it's redundant):
 			       Start: \{\{~?#?\s*(?=(if|unless|with|link\-to|each(\-in)?)\b)
 			       End:   \{\{~?/\s*(?=(if|unless|with|link\-to|each(\-in)?)\b)  -->
-			<RegExpr context="#pop!MustacheVariableBlock" attribute="Mustache Block" String="\{\{~?\s*else(\s+(if|unless|with|link\-to|each(\-in)?))?\b" />
+			<RegExpr context="#pop!MustacheVariableBlock" attribute="Mustache Block" String="\{\{~?\s*else(?:\s+(?:if|unless|with|link\-to|each(?:\-in)?))?\b" />
 			<RegExpr context="#pop!MustacheVariableBlock" attribute="Mustache Block" String="\{\{~?[#\^][&gt;\*]?\s*&identifier;\b" beginRegion="MustacheBlock" />
 			<RegExpr context="#pop" attribute="Mustache Block" String="\{\{~?/\s*&identifier;\s*\}\}" endRegion="MustacheBlock" />
 			<RegExpr context="#pop!MustacheVariableBlockEndFolding" attribute="Mustache Block" String="\{\{~?/\s*&identifier;\b" />
@@ -98,8 +99,8 @@
 			<StringDetect context="#pop!MustachePartial" attribute="Mustache Variable" String="{{&gt;" />
 			<StringDetect context="#pop!MustacheMarkerSet" attribute="Mustache Variable" String="{{=" />
 			<StringDetect context="#pop!MustacheVariable" attribute="Mustache Variable" String="{{$" />
-			<RegExpr context="#pop!MustacheVariableUnescape" attribute="Mustache Variable Unescape" String="\{\{\{\s*(log|link)\b" />
-			<RegExpr context="#pop!MustacheVariable" attribute="Mustache Variable" String="\{\{\s*(log|link)\b" />
+			<RegExpr context="#pop!MustacheVariableUnescape" attribute="Mustache Variable Unescape" String="\{\{\{\s*(?:log|link)\b" />
+			<RegExpr context="#pop!MustacheVariable" attribute="Mustache Variable" String="\{\{\s*(?:log|link)\b" />
 
 			<StringDetect context="#pop!MustacheVariableUnescape" attribute="Mustache Variable Unescape" String="{{{" />
 			<Detect2Chars context="#pop!MustacheVariable" attribute="Mustache Variable" char="{" char1="{" />
@@ -214,7 +215,7 @@
 			<WordDetect context="ElementTagEnd" attribute="Element Tag" String="&lt;/header" insensitive="true" endRegion="header" />
 			<WordDetect context="ElementTagEnd" attribute="Element Tag" String="&lt;/main" insensitive="true" endRegion="main" />
 			<WordDetect context="ElementTagEnd" attribute="Element Tag" String="&lt;/nav" insensitive="true" endRegion="nav" />
-			<WordDetect context="ElementTagEnd" attribute="Element Tag" String="&lt;/sectiond" insensitive="true" endRegion="section" />
+			<WordDetect context="ElementTagEnd" attribute="Element Tag" String="&lt;/section" insensitive="true" endRegion="section" />
 
 			<RegExpr context="#stay" attribute="Element Tag" String="&lt;/\s*&gt;" />
 			<RegExpr context="ElementTagEnd" attribute="Element Tag" String="&lt;/\s*&name;" />
@@ -271,7 +272,7 @@
 		<context name="Comment" attribute="Comment" lineEndContext="#stay">
 			<DetectSpaces/>
 			<StringDetect context="#pop" attribute="Comment" String="--&gt;" endRegion="Comment" />
-			<RegExpr context="#stay" attribute="Error" String="-(-(?!-&gt;))+" />
+			<RegExpr context="#stay" attribute="Error" String="-(?:-(?!-&gt;))+" />
 			<IncludeRules context="MustacheVariables" />
 			<IncludeRules context="##Alerts" />
 		</context>
@@ -283,7 +284,7 @@
 		</context>
 
 		<context name="FindDTDRules" attribute="Normal Text" lineEndContext="#stay">
-			<RegExpr context="Doctype Markupdecl" attribute="Doctype" String="&lt;!(ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
+			<RegExpr context="Doctype Markupdecl" attribute="Doctype" String="&lt;!(?:ELEMENT|ENTITY|ATTLIST|NOTATION)\b" />
 		</context>
 		<context name="FindPI" attribute="Normal Text" lineEndContext="#stay">
 			<RegExpr context="PI" attribute="Processing Instruction" String="&lt;\?[\w:-]*" beginRegion="pi" />