diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index c09e7dd4f..60cc3fa2e 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-21  Hans-Peter Nilsson  <hp@axis.com>
+
+	* libnosys/warning.h (stub_warning): Remove "warning: " prefix.
+
 2005-01-18  Hans-Peter Nilsson  <hp@axis.com>
 
 	* libnosys/warning.h (link_warning) [HAVE_GNU_LD and HAVE_ELF]:
diff --git a/libgloss/libnosys/warning.h b/libgloss/libnosys/warning.h
index 767a5de79..9232a9244 100644
--- a/libgloss/libnosys/warning.h
+++ b/libgloss/libnosys/warning.h
@@ -35,9 +35,10 @@
 # define link_warning(symbol, msg)
 #endif
 
-/* A canned warning for sysdeps/stub functions.  */
+/* A canned warning for sysdeps/stub functions.
+   The GNU linker prepends a "warning: " string.  */
 #define stub_warning(name) \
   link_warning (name, \
-                "warning: " #name " is not implemented and will always fail")
+                #name " is not implemented and will always fail")
 
 #endif /* __WARNING_H__ */