diff --git a/syntax/php.template b/syntax/php.template
index fe14a6e..8b75a95 100644
--- a/syntax/php.template
+++ b/syntax/php.template
@@ -150,6 +150,7 @@ syn match phpMemberSelector "->"  contained display
 syn match phpVarSelector    "\$"  contained display
 " highlight object variables inside strings
 syn match phpMethodsVar     "->\h\w*" contained contains=phpMethods,phpMemberSelector display containedin=phpStringDouble
+syn match phpClasses "\v[A-Za-z]+(::)@=" contained display
 
 " Identifier
 syn match  phpIdentifier         "$\h\w*"  contained contains=phpEnvVar,phpIntVar,phpVarSelector display
@@ -186,12 +187,13 @@ endif
 
 " Todo
 syn keyword phpTodo todo fixme xxx note contained
+syn match phpCommentSelector "\v\@(return|var|param|abstract|access|author|copyright|deprecated|example|global|ignore|internal|link|name|magic|package|see|since|static|staticvar|subpackage|todo|version)" contained
 
 " Comment
 if exists("php_parent_error_open")
-  syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,@Spell
+  syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,phpCommentSelector,@Spell
 else
-  syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,@Spell extend
+  syn region phpComment start="/\*" end="\*/" contained contains=phpTodo,phpCommentSelector,@Spell extend
 endif
 if version >= 600
   syn match phpComment  "#.\{-}\(?>\|$\)\@="  contained contains=phpTodo,@Spell
@@ -315,6 +317,7 @@ if !exists("did_php_syn_inits")
   hi def link phpException        Statement
   hi def link phpOperator         Operator
   hi def link phpVarSelector      Operator
+  hi def link phpCommentSelector  PreProc
   hi def link phpInclude          PreProc
   hi def link phpDefine           PreProc
   hi def link phpSpecial          PreProc
diff --git a/syntax/php.vim b/syntax/php.vim
index 35d21bf..b10c832 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -414,7 +414,7 @@ endif
 
 " Todo
 syn keyword phpTodo todo fixme xxx note contained
-syn match phpCommentSelector "\v\@(return|var|param)" contained
+syn match phpCommentSelector "\v\@(return|var|param|abstract|access|author|copyright|deprecated|example|global|ignore|internal|link|name|magic|package|see|since|static|staticvar|subpackage|todo|version)" contained
 
 " Comment
 if exists("php_parent_error_open")