diff --git a/ChangeLog b/ChangeLog
index ea5367ca90..72255512a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-26  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+	* sysdeps/generic/unwind.h
+	(_Unwind_Word): Use __mode__(__unwind_word__)
+	instead of __mode__(__word__).
+	(_Unwind_Sword): Likewise.
+
 2015-08-26  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* sysdeps/s390/s390-64/utf8-utf16-z9.c
diff --git a/sysdeps/generic/unwind.h b/sysdeps/generic/unwind.h
index 41b6aecd62..75d3084aca 100644
--- a/sysdeps/generic/unwind.h
+++ b/sysdeps/generic/unwind.h
@@ -31,8 +31,8 @@ extern "C" {
 
 /* @@@ The IA-64 ABI uses uint64 throughout.  Most places this is
    inefficient for 32-bit and smaller machines.  */
-typedef unsigned _Unwind_Word __attribute__((__mode__(__word__)));
-typedef signed _Unwind_Sword __attribute__((__mode__(__word__)));
+typedef unsigned _Unwind_Word __attribute__((__mode__(__unwind_word__)));
+typedef signed _Unwind_Sword __attribute__((__mode__(__unwind_word__)));
 #if defined(__ia64__) && defined(__hpux__)
 typedef unsigned _Unwind_Ptr __attribute__((__mode__(__word__)));
 #else