diff --git a/ChangeLog b/ChangeLog
index 623a4f1a13..eae84c2c59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 28 11:46:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/ytab.sed: skip yydestruct hack unless yymsg exists, for bison
+	  1.8 series.  [ruby-dev:32825]
+
 Fri Dec 28 11:39:02 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* golf_prelude.rb (Object.quine): need to join because SCRIPT_LINES__[]
diff --git a/tool/ytab.sed b/tool/ytab.sed
index 92f8218202..17a57fe494 100755
--- a/tool/ytab.sed
+++ b/tool/ytab.sed
@@ -5,7 +5,7 @@ i\
 a\
 #endif
 }
-/^yydestruct/,/#endif/{
+/^yydestruct.*yymsg/,/#endif/{
   /^yydestruct/{
     /parser/!{
       h