diff --git a/ChangeLog b/ChangeLog
index 04ca7f8c9..770b8a672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2006-01-09  Brad Taylor  <brad@getcoded.net>
+2007-01-09  Bart Deleye  <bart.deleye@gmail.com>
+
+	* parser/gapi_pp.pl : regex fix for tinymail parse.
+
+2007-01-09  Brad Taylor  <brad@getcoded.net>
 	
 	* gdk/Pixbuf.custom: Properly dispose of PixbufLoaders when we're done
 	  with them.
diff --git a/parser/gapi_pp.pl b/parser/gapi_pp.pl
index fcfe0acf4..f25e712e2 100755
--- a/parser/gapi_pp.pl
+++ b/parser/gapi_pp.pl
@@ -82,7 +82,7 @@ foreach $fname (@hdrs) {
 		} elsif ($line =~ /^extern/) {
 			while ($line !~ /;/) {$line = <INFILE>;}
 		} elsif ($line =~ /^#ifndef\s+\w+_H_*\b/) {
-			while ($line !~ /#define/) {$line = <INFILE>;}
+			while ($line !~ /#define|#endif/) {$line = <INFILE>;}
 		} elsif ($line =~ /$private_regex/) {
 			$nested = 0;
 			while ($line = <INFILE>) {