diff --git a/autotests/folding/highlight.cpp.fold b/autotests/folding/highlight.cpp.fold
--- a/autotests/folding/highlight.cpp.fold
+++ b/autotests/folding/highlight.cpp.fold
@@ -505,3 +505,11 @@
 __GCC_ATOMIC_CHAR16_T_LOCK_FREE
 __GNUC__
 __linux__
+
+// Digraphs (see bug #411508)
+%:include <stdio.h>
+int main()
+<beginfold id='1'><%</beginfold id='1'>
+    []()<beginfold id='1'>{</beginfold id='1'><endfold id='1'>%></endfold id='1'>();
+<endfold id='1'>}</endfold id='1'>
+<:<:fallthrough]]
diff --git a/autotests/folding/test.c.fold b/autotests/folding/test.c.fold
--- a/autotests/folding/test.c.fold
+++ b/autotests/folding/test.c.fold
@@ -67,3 +67,12 @@
 
 
 int i = 0; // this should not be highlighted as a string
+
+<beginfold id='4'>/*</beginfold id='4'>
+ * Digraphs (see bug #411508)
+ <endfold id='4'>*/</endfold id='4'>
+%:include <stdio.h>
+int a()
+<beginfold id='3'><%</beginfold id='3'>
+    []()<beginfold id='3'>{</beginfold id='3'><endfold id='3'>%></endfold id='3'>();
+<endfold id='3'>}</endfold id='3'>
diff --git a/autotests/html/highlight.cpp.html b/autotests/html/highlight.cpp.html
--- a/autotests/html/highlight.cpp.html
+++ b/autotests/html/highlight.cpp.html
@@ -511,4 +511,12 @@
 <span style="color:#006e28;">__GCC_ATOMIC_CHAR16_T_LOCK_FREE</span>
 <span style="color:#006e28;">__GNUC__</span>
 <span style="color:#006e28;">__linux__</span>
+
+<span style="color:#898887;">// Digraphs (see bug #411508)</span>
+<span style="color:#006e28;">%:include </span><span style="color:#ff5500;">&lt;stdio.h&gt;</span>
+<span style="color:#0057ae;">int</span> main()
+&lt;%
+    [](){%&gt;();
+}
+&lt;:&lt;:<span style="color:#0057ae;font-style:italic;">fallthrough</span>]]
 </pre></body></html>
diff --git a/autotests/html/test.c.html b/autotests/html/test.c.html
--- a/autotests/html/test.c.html
+++ b/autotests/html/test.c.html
@@ -73,4 +73,13 @@
 
 
 <span style="color:#0057ae;">int</span> i = <span style="color:#b08000;">0</span>; <span style="color:#898887;">// this should not be highlighted as a string</span>
+
+<span style="color:#898887;">/*</span>
+<span style="color:#898887;"> * Digraphs (see bug #411508)</span>
+<span style="color:#898887;"> */</span>
+<span style="color:#006e28;">%:include </span><span style="color:#ff5500;">&lt;stdio.h&gt;</span>
+<span style="color:#0057ae;">int</span> a()
+&lt;%
+    [](){%&gt;();
+}
 </pre></body></html>
diff --git a/autotests/input/highlight.cpp b/autotests/input/highlight.cpp
--- a/autotests/input/highlight.cpp
+++ b/autotests/input/highlight.cpp
@@ -505,3 +505,11 @@
 __GCC_ATOMIC_CHAR16_T_LOCK_FREE
 __GNUC__
 __linux__
+
+// Digraphs (see bug #411508)
+%:include <stdio.h>
+int main()
+<%
+    [](){%>();
+}
+<:<:fallthrough]]
diff --git a/autotests/input/test.c b/autotests/input/test.c
--- a/autotests/input/test.c
+++ b/autotests/input/test.c
@@ -67,3 +67,12 @@
 
 
 int i = 0; // this should not be highlighted as a string
+
+/*
+ * Digraphs (see bug #411508)
+ */
+%:include <stdio.h>
+int a()
+<%
+    [](){%>();
+}
diff --git a/autotests/reference/highlight.cpp.ref b/autotests/reference/highlight.cpp.ref
--- a/autotests/reference/highlight.cpp.ref
+++ b/autotests/reference/highlight.cpp.ref
@@ -505,3 +505,11 @@
 <GNU Macros>__GCC_ATOMIC_CHAR16_T_LOCK_FREE</GNU Macros><br/>
 <GNU Macros>__GNUC__</GNU Macros><br/>
 <GNU Macros>__linux__</GNU Macros><br/>
+<Normal Text></Normal Text><br/>
+<Comment>// Digraphs (see bug #411508)</Comment><br/>
+<Preprocessor>%:include </Preprocessor><Prep. Lib><stdio.h></Prep. Lib><br/>
+<Data Type>int</Data Type><Normal Text> main</Normal Text><Symbol>()</Symbol><br/>
+<Symbol><%</Symbol><br/>
+<Normal Text>    </Normal Text><Symbol>[](){%>()</Symbol><Separator Symbol>;</Separator Symbol><br/>
+<Symbol>}</Symbol><br/>
+<Symbol><:<:</Symbol><Standard Attribute>fallthrough</Standard Attribute><Symbol>]]</Symbol><br/>
diff --git a/autotests/reference/test.c.ref b/autotests/reference/test.c.ref
--- a/autotests/reference/test.c.ref
+++ b/autotests/reference/test.c.ref
@@ -67,3 +67,12 @@
 <Normal Text></Normal Text><br/>
 <Normal Text></Normal Text><br/>
 <Data Type>int</Data Type><Normal Text> i </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Decimal>0</Decimal><Symbol>;</Symbol><Normal Text> </Normal Text><Comment>// this should not be highlighted as a string</Comment><br/>
+<Normal Text></Normal Text><br/>
+<Comment>/*</Comment><br/>
+<Comment> * Digraphs (see bug #411508)</Comment><br/>
+<Comment> */</Comment><br/>
+<Preprocessor>%:include </Preprocessor><Prep. Lib><stdio.h></Prep. Lib><br/>
+<Data Type>int</Data Type><Normal Text> a</Normal Text><Symbol>()</Symbol><br/>
+<Symbol><%</Symbol><br/>
+<Normal Text>    </Normal Text><Symbol>[](){%>();</Symbol><br/>
+<Symbol>}</Symbol><br/>
diff --git a/data/syntax/c.xml b/data/syntax/c.xml
--- a/data/syntax/c.xml
+++ b/data/syntax/c.xml
@@ -5,9 +5,12 @@
     <!ENTITY hex_int "(?:[0-9A-Fa-f](?:'?[0-9A-Fa-f]+)*)">
     <!ENTITY exp_float "(?:[eE][+-]?&int;)">
     <!ENTITY exp_hexfloat "(?:[pP][-+]?&int;)">
+
+    <!ENTITY ispphash "(?:#|&#37;\:|\?\?=)">
+    <!ENTITY pphash "&ispphash;\s*">
 ]>
 <language name="C" section="Sources"
-          version="6" kateversion="5.0"
+          version="7" kateversion="5.0"
           indenter="cstyle"
           extensions="*.c;*.C;*.h"
           mimetype="text/x-csrc;text/x-c++src;text/x-chdr"
@@ -116,16 +119,18 @@
     <contexts>
       <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
         <DetectSpaces />
-	<RegExpr attribute="Preprocessor" context="Outscoped" String="#\s*if\s+0\s*$" beginRegion="PP" firstNonSpace="true" />
-        <DetectChar context="AfterHash" char="#" firstNonSpace="true" lookAhead="true" />
+	<RegExpr attribute="Preprocessor" context="Outscoped" String="&pphash;if\s+0\s*$" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr context="AfterHash" String="&ispphash;" firstNonSpace="true" lookAhead="true" />
         <StringDetect attribute="Region Marker" context="Region Marker" String="//BEGIN" beginRegion="Region1" firstNonSpace="true" />
         <StringDetect attribute="Region Marker" context="Region Marker" String="//END" endRegion="Region1" firstNonSpace="true" />
         <keyword attribute="Control Flow" context="#stay" String="controlflow"/>
         <keyword attribute="Keyword" context="#stay" String="keywords"/>
         <keyword attribute="Data Type" context="#stay" String="types"/>
         <DetectIdentifier />
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
+        <Detect2Chars attribute="Symbol" context="#stay" char="&lt;" char1="%" beginRegion="Brace1" /> <!-- Digraph: { -->
+        <Detect2Chars attribute="Symbol" context="#stay" char="%" char1="&gt;" endRegion="Brace1" /> <!-- Digraph: } -->
 
         <!-- Match numbers -->
         <RegExpr attribute="Decimal" context="Number" String="\.?[0-9]" lookAhead="true" />
@@ -158,19 +163,19 @@
       </context>
 
       <context attribute="Error" lineEndContext="#pop" name="AfterHash">
-        <RegExpr attribute="Preprocessor" context="Include" String="#\s*(?:include|include_next)" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Include" String="&pphash;(?:include|include_next)" insensitive="true" firstNonSpace="true" />
 
         <!-- define, elif, else, endif, error, if, ifdef, ifndef, line, pragma, undef, warning -->
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="Define" String="#\s*define.*((?=\\))" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="&pphash;if(?:def|ndef)?(?=\s+\S)" insensitive="true" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="&pphash;endif" insensitive="true" endRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Define" String="&pphash;define.*((?=\\))" insensitive="true" firstNonSpace="true" />
 
         <!-- folding for apple style #pragma mark - label -->
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*pragma\s+mark\s+-\s*$" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" />
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*pragma\s+mark" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" beginRegion="pragma_mark" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="&pphash;pragma\s+mark\s+-\s*$" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="&pphash;pragma\s+mark" insensitive="true" firstNonSpace="true" endRegion="pragma_mark" beginRegion="pragma_mark" />
 
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s*(?:el(?:se|if)|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="Preprocessor" String="#\s+[0-9]+" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="&pphash;(?:el(?:se|if)|define|undef|line|error|warning|pragma)" insensitive="true" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="Preprocessor" String="&ispphash;\s+[0-9]+" insensitive="true" firstNonSpace="true" />
       </context>
 
       <context attribute="Preprocessor" lineEndContext="#pop" name="Include">
@@ -203,9 +208,9 @@
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
-        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*el(?:se|if)" firstNonSpace="true" />
-        <RegExpr attribute="Preprocessor" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Comment" context="Outscoped intern" String="&pphash;if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="&pphash;el(?:se|if)" firstNonSpace="true" />
+        <RegExpr attribute="Preprocessor" context="#pop" String="&pphash;endif" endRegion="PP" firstNonSpace="true" />
       </context>
 
       <context attribute="Comment" lineEndContext="#stay" name="Outscoped intern">
@@ -216,8 +221,8 @@
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Commentar 1" char="/" char1="/"/>
         <Detect2Chars attribute="Comment" context="Commentar 2" char="/" char1="*" beginRegion="Comment"/>
-        <RegExpr attribute="Comment" context="Outscoped intern" String="#\s*if" beginRegion="PP" firstNonSpace="true" />
-        <RegExpr attribute="Comment" context="#pop" String="#\s*endif" endRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Comment" context="Outscoped intern" String="&pphash;if" beginRegion="PP" firstNonSpace="true" />
+        <RegExpr attribute="Comment" context="#pop" String="&pphash;endif" endRegion="PP" firstNonSpace="true" />
       </context>
 
       <context name="Number" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
diff --git a/data/syntax/isocpp.xml b/data/syntax/isocpp.xml
--- a/data/syntax/isocpp.xml
+++ b/data/syntax/isocpp.xml
@@ -22,7 +22,7 @@
 <language
     name="ISO C++"
     section="Sources"
-    version="16"
+    version="17"
     kateversion="5.0"
     indenter="cstyle"
     style="C++"
@@ -294,15 +294,15 @@
         <!-- Match scope regions -->
         <DetectChar attribute="Symbol" context="#stay" char="{" beginRegion="Brace1" />
         <DetectChar attribute="Symbol" context="#stay" char="}" endRegion="Brace1" />
+        <Detect2Chars attribute="Symbol" context="#stay" char="&lt;" char1="%" beginRegion="Brace1" /> <!-- Digraph: { -->
+        <Detect2Chars attribute="Symbol" context="#stay" char="%" char1="&gt;" endRegion="Brace1" /> <!-- Digraph: } -->
         <!-- Detect attributes -->
         <Detect2Chars attribute="Symbol" context="Attribute" char="[" char1="[" />
+        <StringDetect attribute="Symbol" context="Attribute" String="&lt;:&lt;:" /> <!-- Digraph: [[ -->
         <!-- Match numbers -->
         <RegExpr attribute="Decimal" context="Number" String="\.?[0-9]" lookAhead="true" />
         <!-- Match comments -->
         <IncludeRules context="match comments and region markers" />
-        <!-- Match punctuators -->
-        <AnyChar attribute="Separator Symbol" context="#stay" String="&separators;" />
-        <AnyChar attribute="Symbol" context="#stay" String="&punctuators;" />
         <!-- Match keywords -->
         <IncludeRules context="match keywords" />
         <!-- Match string literals -->
@@ -320,6 +320,9 @@
         <IncludeRules context="match identifier" />
         <!-- Match preprocessor directives -->
         <RegExpr attribute="Preprocessor" context="AfterHash" String="&ispphash;" lookAhead="true" />
+        <!-- Match punctuators -->
+        <AnyChar attribute="Separator Symbol" context="#stay" String="&separators;" />
+        <AnyChar attribute="Symbol" context="#stay" String="&punctuators;" />
         <!-- Match invalid symbols -->
         <AnyChar attribute="Error" context="#stay" String="$@`" />
       </context>
@@ -519,6 +522,7 @@
         <DetectSpaces/>
         <keyword attribute="Standard Attribute" context="#stay" String="attributes" />
         <Detect2Chars attribute="Symbol" context="#pop" char="]" char1="]" />
+        <StringDetect attribute="Symbol" context="#pop" String=":&gt;:&gt;" /> <!-- Digraph: ]] -->
         <DetectChar attribute="Separator Symbol" context="#stay" char="," />
         <AnyChar attribute="Symbol" context="#stay" String="&punctuators;" />
         <!-- Attributes may contain some text: [[deprecated("Reason text")]] -->
@@ -696,6 +700,7 @@
         <AnyChar attribute="Symbol" context="#stay" String="{}" />
         <!-- Detect attributes -->
         <Detect2Chars attribute="Symbol" context="Attribute In PP" char="[" char1="[" />
+        <StringDetect attribute="Symbol" context="Attribute In PP" String="&lt;:&lt;:" /> <!-- Digraph: [[ -->
         <!-- Match numbers -->
         <RegExpr attribute="Decimal" context="Number" String="\.?[0-9]" lookAhead="true" />
         <!-- Match comments -->