diff --git a/syntax/eo.vim b/syntax/eo.vim
index 823375b..8e346fe 100644
--- a/syntax/eo.vim
+++ b/syntax/eo.vim
@@ -19,7 +19,10 @@ syn match      className               "(\w\+\.)*\w\+"
 
 syn match      attributes              "@\(inout\|out\|in\|class\|const\|extern\|protected\|constructor\|nonull\|warn_unused\)"
 
-syn region     eo_comment start="\/\*" end="\*\/"
+syn keyword	eoTodo		contained TODO FIXME XXX
+syn cluster	eoCommentGroup	contains=eoTodo
+
+syn region     eo_comment start="\/\*" end="\*\/" contains=@eoCommentGroup
 
 hi def link classKeywords Function
 hi def link functionKeywords Label
@@ -29,5 +32,6 @@ hi def link eoBoolean Boolean
 hi def link eoConstants Constant
 
 hi def link eoType Type
+hi def link eoTodo Todo
 
 let b:current_syntax = "eo"