diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 84c6e4bd2..1e5bf05ba 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-21  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* cygwin.din: Mark __assert* and _abort as NOSIGFE.
+
 2011-02-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_socket (fhandler_socket::readv): Call recv_internal directly,
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
index c0dd2d6c0..b0c330031 100644
--- a/winsup/cygwin/cygwin.din
+++ b/winsup/cygwin/cygwin.din
@@ -33,7 +33,7 @@ _tzname DATA
 _Exit SIGFE
 a64l NOSIGFE
 abort NOSIGFE
-_abort = abort SIGFE
+_abort = abort NOSIGFE
 abs NOSIGFE
 _abs = abs NOSIGFE
 accept = cygwin_accept SIGFE
@@ -121,9 +121,9 @@ asprintf SIGFE
 _asprintf = asprintf SIGFE
 asprintf_r = _asprintf_r SIGFE
 _asprintf_r SIGFE
-__assert SIGFE
-__assert_func SIGFE
-__assertfail SIGFE
+__assert NOSIGFE
+__assert_func NOSIGFE
+__assertfail NOSIGFE
 atan NOSIGFE
 _atan = atan NOSIGFE
 atan2 NOSIGFE