diff --git a/ChangeLog b/ChangeLog
index dfa0a38c..3c5421aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* data/yacc.c (yyparse): Correct the comment when locations aren't used.
+	Problem reported by Claudio Saavedra in
+	<http://lists.gnu.org/archive/html/bug-bison/2008-01/msg00003.html>.
+
 2008-01-05  Wojciech Polak  <polak@gnu.org>
 
 	* data/xslt/xml2xhtml.xsl (xsl:template match="/"): Precede an XHTML
diff --git a/data/yacc.c b/data/yacc.c
index f76b06f4..32a1e20a 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1018,10 +1018,10 @@ b4_c_function_def([yyparse], [int], b4_parse_param)
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+  /* The stacks and their tools:
+     `yyss' is related to states.
+     `yyvs' is related to semantic values.]b4_locations_if([[
+     `yyls' is related to locations.]])[
 
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */