diff --git a/ChangeLog b/ChangeLog
index a41461dafc..007b61cde3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
+
+	* string/strncat.c (strncat): Undef the symbol in case it has been
+	defined in bits/string.h.
+
 2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 
 	* elf/sotruss.ksh: Clean up, fix, and complete help messages.
diff --git a/string/strncat.c b/string/strncat.c
index 0a3d4af709..bf6f99b277 100644
--- a/string/strncat.c
+++ b/string/strncat.c
@@ -25,6 +25,7 @@ typedef char reg_char;
 #endif
 
 #ifndef STRNCAT
+# undef strncat
 # define STRNCAT  strncat
 #endif