diff --git a/syntax/ChangeLog b/syntax/ChangeLog
index d55c47c3b..478334b5d 100644
--- a/syntax/ChangeLog
+++ b/syntax/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-08  Leonard den Ottolander  <leonard den ottolander nl>
+
+	* php.syntax: Added magic constants.
+
 2006-01-29  Roland Illig  <roland.illig@gmx.de>
 
 	* xml.syntax: Attribute names only reach upto the next "=", not
diff --git a/syntax/php.syntax b/syntax/php.syntax
index cdc2056f6..e4124119d 100644
--- a/syntax/php.syntax
+++ b/syntax/php.syntax
@@ -8312,8 +8312,12 @@ context default
     keyword whole and white
     keyword whole or white
 
+# Magic constants
     keyword whole __FILE__ brightred
     keyword whole __LINE__ brightred
+    keyword whole __FUNCTION__ brightred
+    keyword whole __CLASS__ brightred
+    keyword whole __METHOD__ brightred
 
     keyword whole parent brightmagenta
     keyword whole $this brightmagenta