diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 37dd7fd48..5fa6c3129 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-05  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/winnt.h (IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE,
+	IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY,
+	IMAGE_DLLCHARACTERISTICS_NX_COMPAT): Fix typo in definitions.
+	(IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE,
+	IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY,
+	IMAGE_DLL_CHARACTERISTICS_NX_COMPAT): Keep broken definitions for
+	backward compatibility.
+
 2011-07-29  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/winsock2.h (SIO_UDP_CONNRESET): Define.
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index d003a50fd..4a437db22 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -1163,15 +1163,20 @@ typedef DWORD FLONG;
 #define IMAGE_SUBSYSTEM_EFI_ROM	13
 #define IMAGE_SUBSYSTEM_XBOX	14
 
-#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE		0x0040
-#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY	0x0080
-#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT		0x0100
+#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE		0x0040
+#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY	0x0080
+#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT		0x0100
 #define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION		0x0200
 #define IMAGE_DLLCHARACTERISTICS_NO_SEH			0x0400
 #define IMAGE_DLLCHARACTERISTICS_NO_BIND		0x0800
 #define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER		0x2000
 #define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE	0x8000
 
+/* Keep broken definitions for backward compatibility. */
+#define IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE
+#define IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY
+#define IMAGE_DLL_CHARACTERISTICS_NX_COMPAT IMAGE_DLLCHARACTERISTICS_NX_COMPAT
+
 #define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader))
 #define IMAGE_DIRECTORY_ENTRY_EXPORT	0
 #define IMAGE_DIRECTORY_ENTRY_IMPORT	1