diff --git a/ChangeLog b/ChangeLog
index 96bc5190..d495dcd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
  * src/build.c:
    Fix warnings when the toolbar does not contain the Run button.
+ * tagmanager/lua.c:
+   Fix wrong parsing of complex expressions in the Lua parser.
 
 
 2009-06-30  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
diff --git a/tagmanager/lua.c b/tagmanager/lua.c
index 22273630..26601eb7 100644
--- a/tagmanager/lua.c
+++ b/tagmanager/lua.c
@@ -110,7 +110,7 @@ static void findLuaTags (void)
 			p = p + 9;  /* skip the `function' word */
 			q = strchr ((const char*) p, '(');
 			extract_name (p, q, name);
-		} else {
+		} else if (*(q+1) != '=') { /* ignore `if type(v) == "function" then ...' */
 			p = (const char*) &line[0];
 			extract_name (p, q, name);
 		}