diff --git a/ChangeLog b/ChangeLog
index b424d57f..5d7cab01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-05-21  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* data/glr.c (yylloc): Output this macro even if locations are not
+	being generated, as the GLR parser needs it even in that case.
+	Problem reported by Troy A. Johnson
+	<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=195946>.
+
 	* configure.ac (AC_INIT): Update to 1.875e.
 
 2004-05-21  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/data/glr.c b/data/glr.c
index a77a9857..b7e5c82d 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -158,7 +158,7 @@ m4_if(b4_prefix[], [yy], [],
 #define yychar  b4_prefix[]char
 #define yydebug b4_prefix[]debug
 #define yynerrs b4_prefix[]nerrs
-b4_location_if([#define yylloc b4_prefix[]lloc])])
+#define yylloc b4_prefix[]lloc])
 
 b4_token_defines(b4_tokens)