diff --git a/ChangeLog b/ChangeLog
index fac360e464..adc53d1515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* include/wchar.h (__wmemset): Use __typeof.
+
 2016-06-03  Carlos O'Donell  <carlos@redhat.com>
 
 	* include/wchar.h (__wmemset): Declare function without typeof.
diff --git a/include/wchar.h b/include/wchar.h
index 96b0438c4f..6272130e24 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -102,7 +102,7 @@ extern int __wcscoll (const wchar_t *__s1, const wchar_t *__s2) __THROW;
 libc_hidden_proto (__wcscoll)
 libc_hidden_proto (wcspbrk)
 
-extern wchar_t *__wmemset (wchar_t *__s, wchar_t __c, size_t __n) __THROW;
+extern __typeof (wmemset) __wmemset;
 extern wchar_t *__wmemchr (const wchar_t *__s, wchar_t __c, size_t __n)
      __THROW __attribute_pure__;
 libc_hidden_proto (wmemchr)