diff --git a/ChangeLog b/ChangeLog
index 6e1e722c..a558e357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-18  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* data/bison.simple (yyoverflowlab): #ifndef yyoverflow, so that
+	there are no `label `yyoverflowlab' defined but not used' warnings
+	when yyoverflow is defined.
+
 2002-06-18  Akim Demaille  <akim@epita.fr>
 
 	* src/symtab.h, src/symtab.c (symbol_t): destructor_location is a
diff --git a/THANKS b/THANKS
index 8bf7741e..0c5b344a 100644
--- a/THANKS
+++ b/THANKS
@@ -28,6 +28,7 @@ Keith Browne            kbrowne@legato.com
 Laurent Mascherpa       laurent.mascherpa@epita.fr
 Magnus Fromreide        magfr@lysator.liu.se
 Marc Autret             autret_m@epita.fr
+Matt Kraai              kraai@alumni.cmu.edu
 Michael Hayes           m.hayes@elec.canterbury.ac.nz
 Mike Castle             dalgoda@ix.netcom.com
 Neil Booth              NeilB@earthling.net
diff --git a/data/bison.simple b/data/bison.simple
index 12710369..d17ff73d 100644
--- a/data/bison.simple
+++ b/data/bison.simple
@@ -1251,6 +1251,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
+#ifndef yyoverflow
 /*---------------------------------------------.
 | yyoverflowab -- parser overflow comes here.  |
 `---------------------------------------------*/
@@ -1258,6 +1259,7 @@ yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
+#endif
 
 yyreturn:
 #ifndef yyoverflow