diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a3a002666..1b3003aae 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+	* exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
+	faulting address.
+
 2015-04-02  Jon TURNEY  <jon.turney@dronecode.org.uk>
 
 	* exceptions.cc (call_signal_handler): Only bother to construct
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0c9ee1459..4a6c21e7c 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1521,6 +1521,10 @@ _cygtls::call_signal_handler ()
 
 	  context.uc_sigmask = context.uc_mcontext.oldmask = this_oldmask;
 
+	  context.uc_mcontext.cr2 = (thissi.si_signo == SIGSEGV
+				     || thissi.si_signo == SIGBUS)
+				    ? (uintptr_t) thissi.si_addr : 0;
+
 	  thiscontext = &context;
 	}