diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index e509a62c054..d5fdc35ebfd 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-03  Roger Sayle  <roger@eyesopen.com>
+	    Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* decNumber.c (__NO_STRING_INLINES): Define to prevent glibc macro
+	definition of strcpy from generating compilation warnings.
+
 2006-01-02  Paolo Bonzini  <bonzini@gnu.org>
 
         PR target/25259
diff --git a/libdecnumber/decNumber.c b/libdecnumber/decNumber.c
index bc11ace8787..3f5cc9f3a44 100644
--- a/libdecnumber/decNumber.c
+++ b/libdecnumber/decNumber.c
@@ -149,6 +149,10 @@
 /*      -ve -- negative                                               */
 /* ------------------------------------------------------------------ */
 
+/* Some of glibc's string inlines cause warnings.  Plus we'd rather
+   rely on (and therefore test) GCC's string builtins.  */
+#define __NO_STRING_INLINES
+
 #include <stdlib.h>		/* for malloc, free, etc. */
 #include <stdio.h>		/* for printf [if needed] */
 #include <string.h>		/* for strcpy */