diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a4d68b230..ba2b657fb 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* exceptions.cc: Drop including ucontext.h.
+
 2015-08-17  Corinna Vinschen  <corinna@vinschen.de>
 
 	* grp.cc (internal_getgrfull): Drop asking caches.  Explain why.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index e6c000f3e..60f09d654 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -17,7 +17,6 @@ details. */
 #include <stdarg.h>
 #include <syslog.h>
 #include <wchar.h>
-#include <ucontext.h>
 
 #include "cygtls.h"
 #include "pinfo.h"
diff --git a/winsup/cygwin/release/2.2.1 b/winsup/cygwin/release/2.2.1
index c16a3de97..294e0c982 100644
--- a/winsup/cygwin/release/2.2.1
+++ b/winsup/cygwin/release/2.2.1
@@ -20,3 +20,6 @@ Bug Fixes
   actually observered in Wine yet.  However, MSDN language indicates this
   might be a problem on real Windows as well.
   Addresses: https://cygwin.com/ml/cygwin/2015-08/msg00225.html
+
+- Include <sys/ucontext.h> from <sys/signal.h> if compiling for POSIX.1-2008.
+  Addresses: https://cygwin.com/ml/cygwin/2015-08/msg00266.html