diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7505d5631c..530dbb0ebb 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* bucomm.h (gettext, dgettext, dcgettext, textdomain,
+	bindtextdomain): Replace defines with those from intl/libgettext.h
+	to quieten gcc warnings.
+
 2000-05-12  H.J. Lu  <hjl@gnu.org>
 
 	* nlmconv.c (temp_filename): Removed.
diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index c6dc26a1f0..e9d675e31a 100644
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -138,12 +138,11 @@ void *alloca ();
 #  define N_(String) (String)
 # endif
 #else
-/* Stubs that do something close enough.  */
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
 # define _(String) (String)
 # define N_(String) (String)
 #endif
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5a028e4df8..237f8d413e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-13  Alan Modra  <alan@linuxcare.com.au>
 
+	* asintl.h (gettext, dgettext, dcgettext, textdomain,
+	bindtextdomain): Replace defines with those from intl/libgettext.h
+	to quieten gcc warnings.
+
 	* NEWS: Mention x86 .arch and -q.
 
 	* config/tc-i386.c (quiet_warnings): New.
diff --git a/gas/asintl.h b/gas/asintl.h
index b733c85f0f..6452989f2e 100644
--- a/gas/asintl.h
+++ b/gas/asintl.h
@@ -33,12 +33,11 @@
 #  define N_(String) (String)
 # endif
 #else
-/* Stubs that do something close enough.  */
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
 # define _(String) (String)
 # define N_(String) (String)
 #endif
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 474658cc38..8a8f4f8e7f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-13  Alan Modra  <alan@linuxcare.com.au>
+
+	* ld.h (gettext, dgettext, dcgettext, textdomain, bindtextdomain):
+	Replace defines with those from intl/libgettext.h to quieten gcc
+	warnings.
+
 2000-05-10  H.J. Lu  <hjl@gnu.org>
 
 	* ldlang.c (open_input_bfds): Don't load the same file within
diff --git a/ld/ld.h b/ld/ld.h
index e2052a0b44..9f98e06846 100644
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -35,12 +35,11 @@
 #  define N_(String) (String)
 # endif
 #else
-/* Stubs that do something close enough.  */
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
+# define gettext(Msgid) (Msgid)
+# define dgettext(Domainname, Msgid) (Msgid)
+# define dcgettext(Domainname, Msgid, Category) (Msgid)
+# define textdomain(Domainname) while (0) /* nothing */
+# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */
 # define _(String) (String)
 # define N_(String) (String)
 #endif