diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5df64e135..0c3f61b8d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-25  Corinna Vinschen  <corinna@vinschen.de>
+
+	* winsup.h (_WIN32_WINNT): Set to 0x0a00 for Windows 10.
+	(WINVER): Ditto.  Remove outdated comment.
+
 2015-08-25  Corinna Vinschen  <corinna@vinschen.de>
 
 	* autoload.cc (std_dll_init): Revert using full paths to system DLLs.
diff --git a/winsup/cygwin/release/2.2.2 b/winsup/cygwin/release/2.2.2
index eb2162b1e..baa2d0dd3 100644
--- a/winsup/cygwin/release/2.2.2
+++ b/winsup/cygwin/release/2.2.2
@@ -12,3 +12,7 @@ Bug Fixes
 - Fix a hang when stracing a forking or spawning process without activating
   stracing of child processes.
   Addresses: https://cygwin.com/ml/cygwin/2015-08/msg00390.html
+
+- Fix long-standing potential SEGV on 32 bit Cygwin when the dynamic loader
+  for OS functions fails to load a function on Windows 7 or later.
+  Addresses: No actual bug report known.
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 4b549dde9..b2c860282 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -19,10 +19,8 @@ details. */
 
 #define EXPORT_ALIAS(sym,symalias) extern "C" __typeof (sym) symalias __attribute__ ((alias(#sym)));
 
-/* Fun, fun, fun.  On Mingw64, WINVER is set according to the value of
-   _WIN32_WINNT, on Mingw32 it's exactly the opposite... */
-#define _WIN32_WINNT 0x0602
-#define WINVER 0x0602
+#define _WIN32_WINNT 0x0a00
+#define WINVER 0x0a00
 
 #define _NO_W32_PSEUDO_MODIFIERS