diff --git a/autotests/folding/test.js.fold b/autotests/folding/test.js.fold
--- a/autotests/folding/test.js.fold
+++ b/autotests/folding/test.js.fold
@@ -21,3 +21,6 @@
 
 ლಠ益ಠლ.ñá = 42;
 δ /No-RegExp/
+
+<beginfold id='3'>/*</beginfold id='3'> Modelines: finish comment in incomplete Modeline:
+ * kate: replace-tabs <endfold id='3'>*/</endfold id='3'> normal text
diff --git a/autotests/html/test.js.html b/autotests/html/test.js.html
--- a/autotests/html/test.js.html
+++ b/autotests/html/test.js.html
@@ -27,4 +27,7 @@
 
 <span style="color:#0057ae;">ლಠ益ಠლ</span>.<span style="color:#0057ae;">ñá</span> = <span style="color:#b08000;">42</span>;
 δ /No-RegExp/
+
+<span style="color:#898887;">/* Modelines: finish comment in incomplete Modeline:</span>
+<span style="color:#898887;"> * </span><span style="color:#ca60ca;">kate:</span><span style="color:#898887;"> </span><span style="color:#0095ff;">replace-tabs</span><span style="color:#898887;"> </span><span style="color:#898887;">*/</span> normal text
 </pre></body></html>
diff --git a/autotests/input/test.js b/autotests/input/test.js
--- a/autotests/input/test.js
+++ b/autotests/input/test.js
@@ -21,3 +21,6 @@
 
 ლಠ益ಠლ.ñá = 42;
 δ /No-RegExp/
+
+/* Modelines: finish comment in incomplete Modeline:
+ * kate: replace-tabs */ normal text
diff --git a/autotests/reference/test.js.ref b/autotests/reference/test.js.ref
--- a/autotests/reference/test.js.ref
+++ b/autotests/reference/test.js.ref
@@ -21,3 +21,6 @@
 <Normal Text></Normal Text><br/>
 <Objects>ლಠ益ಠლ</Objects><Normal Text>.</Normal Text><Object Member>ñá</Object Member><Normal Text> </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Decimal>42</Decimal><Symbol>;</Symbol><br/>
 <Normal Text>δ </Normal Text><Symbol>/</Symbol><Normal Text>No</Normal Text><Symbol>-</Symbol><Normal Text>RegExp</Normal Text><Symbol>/</Symbol><br/>
+<Normal Text></Normal Text><br/>
+<Comment>/* Modelines: finish comment in incomplete Modeline:</Comment><br/>
+<Comment> * </Comment><Keyword>kate:</Keyword><Comment> </Comment><Variable>replace-tabs</Variable><Comment> </Comment><Comment>*/</Comment><Normal Text> normal text</Normal Text><br/>
diff --git a/data/syntax/modelines.xml b/data/syntax/modelines.xml
--- a/data/syntax/modelines.xml
+++ b/data/syntax/modelines.xml
@@ -8,7 +8,7 @@
   Copyright (c) 2012-2014 by Alex Turbov (i.zaufi@gmail.com)
   -->
 <language name="Modelines"
-          version="4"
+          version="5"
           kateversion="5.0"
           section="Other"
           extensions=""
@@ -130,27 +130,27 @@
     <context name="Normal" attribute="Comment" lineEndContext="#pop">
       <DetectSpaces />
       <keyword String="ModelineStartKeyword" context="Modeline" attribute="Keyword" />
-      <RegExpr String="kate-(mimetype|wildcard)\(.*\):" context="Modeline" attribute="Keyword" />
+      <RegExpr String="kate-(?:mimetype|wildcard)\(.*\):" context="Modeline" attribute="Keyword" />
     </context>
 
-    <context name="Modeline" attribute="Comment" lineEndContext="#pop">
+    <context name="Modeline" attribute="Comment" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
       <DetectSpaces />
       <keyword String="Booleans" context="Booleans" attribute="Variable" />
       <keyword String="Integrals" context="Integrals" attribute="Variable" />
       <keyword String="Strings" context="Strings" attribute="Variable" />
       <keyword String="RemoveSpaces" context="RemoveSpaces" attribute="Variable" />
       <LineContinue context="#pop" />
     </context>
 
-    <context name="Booleans" attribute="Comment" lineEndContext="#pop">
+    <context name="Booleans" attribute="Comment" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
       <DetectSpaces />
       <keyword String="True" attribute="Option ON" context="#stay" />
       <keyword String="False" attribute="Option OFF" context="#stay" />
       <DetectChar char="&end;" context="#pop" attribute="Variable" />
       <LineContinue context="#pop" />
     </context>
 
-    <context name="Integrals" attribute="Comment" lineEndContext="#pop">
+    <context name="Integrals" attribute="Comment" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
       <DetectSpaces />
       <Int attribute="Number" context="#stay" />
       <DetectChar char="&end;" context="#pop" attribute="Variable" />
@@ -164,13 +164,13 @@
       <LineContinue context="#pop" />
     </context>
 
-    <context name="RemoveSpaces" attribute="Comment" lineEndContext="#pop">
+    <context name="RemoveSpaces" attribute="Comment" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
       <DetectSpaces />
       <keyword String="RemoveSpacesOptions" attribute="Value" context="#pop!RemoveSpacesEnd" />
       <DetectChar char="&end;" context="#pop" attribute="Variable" />
       <LineContinue context="#pop" />
     </context>
-    <context name="RemoveSpacesEnd" attribute="Comment" lineEndContext="#pop">
+    <context name="RemoveSpacesEnd" attribute="Comment" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
       <DetectChar char="&end;" context="#pop" attribute="Variable" />
     </context>