diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 33abbc8..159d347 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -3,9 +3,9 @@
 " Maintainer: The LLVM team, http://llvm.org/
 " Version:      $Revision$
 
-if version < 600
+if v:version < 600
   syntax clear
-elseif exists("b:current_syntax")
+elseif exists('b:current_syntax')
   finish
 endif
 
@@ -180,7 +180,8 @@ syn match   llvmFloat  /-\?\<\d\+\.\d*\(e[+-]\d\+\)\?\>/
 syn match   llvmFloat  /\<0x\x\+\>/
 syn keyword llvmBoolean true false
 syn keyword llvmConstant zeroinitializer undef null none
-syn match   llvmComment /;.*$/
+syn match   llvmTodo /\(TODO\|FIXME\|XXX\)/
+syn match   llvmComment /;.*$/ contains=llvmTodo
 syn region  llvmString start=/"/ skip=/\\"/ end=/"/
 syn match   llvmLabel /[-a-zA-Z$._][-a-zA-Z$._0-9]*:/
 syn match   llvmIdentifier /[%@][-a-zA-Z$._][-a-zA-Z$._0-9]*/
@@ -204,8 +205,8 @@ syn match  llvmSpecialComment /;\s*CHECK:.*$/
 syn match  llvmSpecialComment "\v;\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL):.*$"
 syn match  llvmSpecialComment /;\s*XFAIL:.*$/
 
-if version >= 508 || !exists("did_c_syn_inits")
-  if version < 508
+if v:version >= 508 || !exists('did_c_syn_inits')
+  if v:version < 508
     let did_c_syn_inits = 1
     command -nargs=+ HiLink hi link <args>
   else
@@ -215,6 +216,7 @@ if version >= 508 || !exists("did_c_syn_inits")
   HiLink llvmType Type
   HiLink llvmStatement Statement
   HiLink llvmNumber Number
+  HiLink llvmTodo Todo
   HiLink llvmComment Comment
   HiLink llvmString String
   HiLink llvmLabel Label
@@ -230,4 +232,4 @@ if version >= 508 || !exists("did_c_syn_inits")
   delcommand HiLink
 endif
 
-let b:current_syntax = "llvm"
+let b:current_syntax = 'llvm'