diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog
index 67233d9844d..ba9936498e2 100644
--- a/texinfo/ChangeLog
+++ b/texinfo/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 26 19:30:00 1999  Mark Klein <mklein@dis.com>
+
+	* makeinfo/makeinfo.c: Add HAVE_LC_MESSAGES around setlocale call.
+
 1999-02-24  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* lib/Makefile.in: Regen dependencies.
diff --git a/texinfo/makeinfo/makeinfo.c b/texinfo/makeinfo/makeinfo.c
index dec3a4ef34f..3094a650d61 100644
--- a/texinfo/makeinfo/makeinfo.c
+++ b/texinfo/makeinfo/makeinfo.c
@@ -945,7 +945,9 @@ main (argc, argv)
   /* Do not use LC_ALL, because LC_NUMERIC screws up the scanf parsing
      of the argument to @multicolumn.  */
   setlocale (LC_TIME, "");
+#ifdef HAVE_LC_MESSAGES
   setlocale (LC_MESSAGES, "");
+#endif
 #endif
 
   /* Set the text message domain.  */