diff --git a/autotests/folding/Jamroot.fold b/autotests/folding/Jamroot.fold
--- a/autotests/folding/Jamroot.fold
+++ b/autotests/folding/Jamroot.fold
@@ -233,3 +233,10 @@
     <endfold id='1'>}</endfold id='1'>
     greet ; # error
 <endfold id='1'>}</endfold id='1'>
+
+# test crazy (and valid) name
+a<b> a<b> [ a<b> a<b> a] ] ;
+rule a<b>() () <beginfold id='1'>{</beginfold id='1'> <endfold id='1'>}</endfold id='1'>
+actions a<b> <beginfold id='1'>{</beginfold id='1'> <endfold id='1'>}</endfold id='1'>
+local a<x> ;
+local a<x> = a<b> ;
diff --git a/autotests/html/Jamroot.html b/autotests/html/Jamroot.html
--- a/autotests/html/Jamroot.html
+++ b/autotests/html/Jamroot.html
@@ -239,4 +239,11 @@
     <span style="font-weight:bold;">}</span>
     <span style="color:#bf0303;text-decoration:underline;">greet</span> <span style="color:#bf0303;text-decoration:underline;">;</span> <span style="color:#898887;"># error</span>
 <span style="font-weight:bold;">}</span>
+
+<span style="color:#898887;"># test crazy (and valid) name</span>
+<span style="color:#644a9b;">a&lt;b&gt;</span> a&lt;b&gt; <span style="font-weight:bold;">[</span> <span style="color:#644a9b;">a&lt;b&gt;</span> a&lt;b&gt; a] <span style="font-weight:bold;">]</span> <span style="font-weight:bold;">;</span>
+<span style="font-weight:bold;">rule</span> <span style="color:#644a9b;">a&lt;b&gt;()</span> <span style="color:#0057ae;">()</span> <span style="font-weight:bold;">{</span> <span style="font-weight:bold;">}</span>
+<span style="font-weight:bold;">actions</span> a&lt;b&gt; <span style="font-weight:bold;">{</span> <span style="font-weight:bold;">}</span>
+<span style="font-weight:bold;">local</span> <span style="color:#0057ae;">a&lt;x&gt;</span> <span style="font-weight:bold;">;</span>
+<span style="font-weight:bold;">local</span> <span style="color:#0057ae;">a&lt;x&gt;</span> <span style="font-weight:bold;">=</span> a&lt;b&gt; <span style="font-weight:bold;">;</span>
 </pre></body></html>
diff --git a/autotests/input/Jamroot b/autotests/input/Jamroot
--- a/autotests/input/Jamroot
+++ b/autotests/input/Jamroot
@@ -233,3 +233,10 @@
     }
     greet ; # error
 }
+
+# test crazy (and valid) name
+a<b> a<b> [ a<b> a<b> a] ] ;
+rule a<b>() () { }
+actions a<b> { }
+local a<x> ;
+local a<x> = a<b> ;
diff --git a/autotests/reference/Jamroot.ref b/autotests/reference/Jamroot.ref
--- a/autotests/reference/Jamroot.ref
+++ b/autotests/reference/Jamroot.ref
@@ -233,3 +233,10 @@
 <Normal>    </Normal><Operator>}</Operator><br/>
 <Normal>    </Normal><Error>greet</Error><Normal> </Normal><Error>;</Error><Normal> </Normal><Comment># error</Comment><br/>
 <Operator>}</Operator><br/>
+<Normal></Normal><br/>
+<Comment># test crazy (and valid) name</Comment><br/>
+<Rule>a<b></Rule><Normal> a<b> </Normal><Operator>[</Operator><Normal> </Normal><Rule>a<b></Rule><Normal> a<b> a] </Normal><Operator>]</Operator><Normal> </Normal><Operator>;</Operator><br/>
+<Keyword>rule</Keyword><Normal> </Normal><Rule>a<b>()</Rule><Normal> </Normal><Varname>()</Varname><Normal> </Normal><Operator>{</Operator><Normal> </Normal><Operator>}</Operator><br/>
+<Keyword>actions</Keyword><Normal> </Normal><Action>a<b></Action><Normal> </Normal><Operator>{</Operator><ActionText> </ActionText><Operator>}</Operator><br/>
+<Keyword>local</Keyword><Normal> </Normal><VarAssign>a<x></VarAssign><Normal> </Normal><Operator>;</Operator><br/>
+<Keyword>local</Keyword><Normal> </Normal><VarAssign>a<x></VarAssign><Normal> </Normal><Operator>=</Operator><Normal> a<b> </Normal><Operator>;</Operator><br/>
diff --git a/data/syntax/jam.xml b/data/syntax/jam.xml
--- a/data/syntax/jam.xml
+++ b/data/syntax/jam.xml
@@ -24,7 +24,7 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 -->
-<language name="Jam" version="5" kateversion="5.0" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase" author="Mildred (silkensedai@online.fr)" license="MIT">
+<language name="Jam" version="6" kateversion="5.0" section="Other" extensions="Jam*;*.jam" mimetype="text/x-jam;text/x-Jamfile;text/x-Jamrules;text/x-Jambase" author="Mildred (silkensedai@online.fr)" license="MIT">
   <!--
   Changelog
     0.2
@@ -378,6 +378,7 @@
         <WordDetect attribute="Operator" context="#stay" String=":"/>
         <WordDetect attribute="Operator" context="#pop#pop" String="]"/>
         <RegExpr attribute="Feature" context="Property" String="&lt;[^\t >]+>"/>
+        <RegExpr attribute="Normal" context="#stay" String="&ident;"/>
         <!-- auto-completion only -->
         <keyword attribute="Feature" context="#stay" String="features"/>
       </context>