diff --git a/ChangeLog b/ChangeLog
index 3b99f693dc..a61cdbcd89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-24  Andreas Schwab  <schwab@redhat.com>
+
+	* wcsmbs/wcslen.c: Don't define WCSLEN, reverse logic.
+
 2011-10-23  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/ieee754/dbl-64/wordsize-64/s_remquo.c: New file.
diff --git a/wcsmbs/wcslen.c b/wcsmbs/wcslen.c
index 4d7972b7c6..991e151720 100644
--- a/wcsmbs/wcslen.c
+++ b/wcsmbs/wcslen.c
@@ -20,12 +20,12 @@
 #include <wchar.h>
 
 /* Return length of string S.  */
-#ifndef WCSLEN
-# define WCSLEN __wcslen
+#ifdef WCSLEN
+# define __wcslen WCSLEN
 #endif
 
 size_t
-WCSLEN (s)
+__wcslen (s)
      const wchar_t *s;
 {
   size_t len = 0;