diff --git a/ChangeLog b/ChangeLog
index d7b4ff85..e392ea26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-16  Akim Demaille  <akim@epita.fr>
+
+	* doc/bison.texinfo (Calc++ Parser): Don't promote defining YYEOF
+	since it's in Bison's name space.
+
 2005-09-15  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* data/glr.c (yyresolveValue): Add default case to pacify
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 50f1f42a..c384d2d4 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -7363,7 +7363,7 @@ avoid name clashes.
 
 @comment file: calc++-parser.yy
 @example
-%token        YYEOF          0 "end of file"
+%token        TOKEN_EOF      0 "end of file"
 %token        TOKEN_ASSIGN     ":="
 %token <sval> TOKEN_IDENTIFIER "identifier"
 %token <ival> TOKEN_NUMBER     "number"