diff --git a/tex.jsf b/tex.jsf
index d15d901..f5333b4 100644
--- a/tex.jsf
+++ b/tex.jsf
@@ -2,6 +2,7 @@
 
 =Idle
 =Comment 	green
+=CommentLabel	bold green
 =Keyword 	bold
 =Mathmode 	cyan
 =Brace		magenta
@@ -17,6 +18,8 @@
 
 :comment Comment
 	*		comment
+	# might be TODO label
+	"BFHNTX"	comment		noeat call=.comment_todo()
 	"\n"		idle
 
 :math Mathmode
@@ -50,3 +53,27 @@
 
 :math_brace Brace
 	*		math		noeat
+
+.subr comment_todo
+# initial state
+:comment_todo_init Comment
+	*		comment_todo_guess	buffer
+
+# highlight common TODO labels
+:comment_todo_guess Comment
+	*		comment_todo_unknown	noeat strings
+	"BUG"		comment_todo
+	"FIXME"		comment_todo
+	"HACK"		comment_todo
+	"NOTE"		comment_todo
+	"TODO"		comment_todo
+	"XXX"		comment_todo
+done
+	"A-Z"		comment_todo_guess
+
+:comment_todo_unknown Comment
+	*		NULL		noeat return
+
+:comment_todo CommentLabel
+	*		NULL		noeat return
+.end