diff --git a/ChangeLog b/ChangeLog
index 3546d33d..6e5296dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
+2002-09-06  Paul Eggert  <eggert@twinsun.com>
+
+	* doc/bison.texinfo (Conditions): Make explicit that the GPL
+	exception applies only to yacc.c.  This is a modification of a
+	patch originally suggested by Akim Demaille.
+
 2002-09-06  Akim Demaille  <akim@epita.fr>
 
+	* data/c.m4 (b4_copyright): Move the GPL exception comment from
+	here to...
+	* data/yacc.c: here.
+
 	* data/lalr1.cc (struct yyltype): Don't define it, since we use
 	LocationType.
 	(b4_ltype): Default to yy::Location from location.hh.