diff --git a/ChangeLog b/ChangeLog
index 7059f2c..39c2e11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-04  Bruno Haible  <bruno@clisp.org>
+
+	* doc/Makefile.in (MAKEINFO): Disable also the LC_MESSAGES and LC_ALL
+	environment variables.
+
 2007-04-04  Bruno Haible  <bruno@clisp.org>
 
 	* configure.ac: Renamed from configure.in.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9790e15..eb08a0d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for gperf/doc
 
-# Copyright (C) 1998, 2000, 2002-2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2000, 2002-2003, 2007 Free Software Foundation, Inc.
 # Written by Douglas C. Schmidt <schmidt@ics.uci.edu>
 # and Bruno Haible <bruno@clisp.org>.
 #
@@ -49,7 +49,7 @@ TEX = tex
 TEXI2DVI = texi2dvi
 DVIPS = dvips -D600
 TEXI2PDF = texi2pdf
-MAKEINFO = LANG= LANGUAGE= makeinfo
+MAKEINFO = LANG= LC_MESSAGES= LC_ALL= LANGUAGE= makeinfo
 TEXI2HTML = texi2html
 
 # Programs used by "make install":