diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4e23d74c5f0..91f0412bd2c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 28 19:16:26 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* as.c (main): Conditionally call setlocale.
+	* gasp.c (main): Likewise.
+	* asintl.h: Include <locale.h> if HAVE_LOCALE_H.
+	(LC_MESSAGES): Now can be defined even when ENABLE_NLS.
+
 start-sanitize-d30v
 Tue Apr 28 18:33:23 1998  Frank Ch. Eigler  <fche@cygnus.com>
 
diff --git a/gas/gasp.c b/gas/gasp.c
index 1b72838ed45..f8e43538892 100644
--- a/gas/gasp.c
+++ b/gas/gasp.c
@@ -3605,7 +3605,9 @@ main (argc, argv)
   ifstack[0].on = 1;
   ifi = 0;
 
+#ifdef HAVE_SETLOCALE
   setlocale (LC_MESSAGES, "");
+#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);