diff --git a/ChangeLog b/ChangeLog
index a69e3e1d7..b73d34879 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-23  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * tagmanager/php.c:
+   Remove duplicate regular expression for parsing classes.
+   Fix and improve parsing of constants (patch by Harold Aling, thanks).
+
+
 2009-11-22  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/toolbar.c, src/geanymenubuttonaction.c, 
diff --git a/tagmanager/php.c b/tagmanager/php.c
index 7a3a7bb0c..ac6775963 100644
--- a/tagmanager/php.c
+++ b/tagmanager/php.c
@@ -70,14 +70,14 @@ static kindOption PhpKinds [] = {
 
 static void installPHPRegex (const langType language)
 {
-	addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)",
-		"\\3", "c,class,classes", NULL);
 	addTagRegex(language, "^[ \t]*((final|abstract)[ \t]+)*class[ \t]+([" ALPHA "_][" ALNUM "_]*)",
 		"\\3", "c,class,classes", NULL);
 	addTagRegex(language, "^[ \t]*interface[ \t]+([" ALPHA "_][" ALNUM "_]*)",
 		"\\1", "i,interface,interfaces", NULL);
 	addTagRegex(language, "^[ \t]*define[ \t]*\\([ \t]*['\"]?([" ALPHA "_][" ALNUM "_]*)",
-		"\\1", "d,define,constant definitions", NULL);
+		"\\1", "m,macro,macros", NULL);
+	addTagRegex(language, "^[ \t]*const[ \t]*([" ALPHA "_][" ALNUM "_]*)[ \t]*[=;]",
+		"\\1", "m,macro,macros", NULL);
 	addTagRegex(language, "^[ \t]*((public|protected|private|static)[ \t]+)*function[ \t]+&?[ \t]*([" ALPHA "_][" ALNUM "_]*)",
 		"\\3", "f,function,functions", NULL);
 	addTagRegex(language, "^[ \t]*(\\$|::\\$|\\$this->)([" ALPHA "_][" ALNUM "_]*)[ \t]*=",