diff --git a/THANKS b/THANKS
index b6a2b2d8..ee05b564 100644
--- a/THANKS
+++ b/THANKS
@@ -87,6 +87,7 @@ Paul Hilfinger            Hilfinger@CS.Berkeley.EDU
 Per Allansson             per@appgate.com
 Peter Fales               psfales@lucent.com
 Peter Hamorsky            hamo@upjs.sk
+Peter Simons              simons@cryp.to
 Piotr Gackiewicz          gacek@intertel.com.pl
 Quoc Peyrot               chojin@lrde.epita.fr
 R Blake                   blakers@mac.com
diff --git a/data/yacc.c b/data/yacc.c
index 1b3dc752..3b111d12 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -171,7 +171,7 @@ m4_define([b4_declare_scanner_communication_variables], [[
 int yychar;
 
 ]b4_pure_if([[
-#if defined __GNUC__ && (4 < __GNUC__ + (6 <= __GNUC_MINOR__))
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
 # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
     _Pragma ("GCC diagnostic push") \