diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 53535e0d2..19b0030d9 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-16  Pavel Tsekov  <ptsekov@gmx.net>
+
+	* exceptions.cc (interrupt_setup): Ensure that the previous signal mask
+	is properly saved.
+
 2002-08-15  Thomas Pfaff  <tpfaff@gmx.net>
 
 	* dcrt0.cc: Modify define for CYGWIN_GUARD.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 9e2e631ec..914e4424d 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -686,7 +686,8 @@ interrupt_setup (int sig, void *handler, DWORD retaddr, DWORD *retaddr_on_stack,
   sigsave.retaddr = retaddr;
   sigsave.retaddr_on_stack = retaddr_on_stack;
   /* FIXME: Not multi-thread aware */
-  sigsave.newmask = myself->getsigmask () | siga.sa_mask | SIGTOMASK (sig);
+  sigsave.oldmask = myself->getsigmask ();
+  sigsave.newmask = sigsave.oldmask | siga.sa_mask | SIGTOMASK (sig);
   sigsave.sa_flags = siga.sa_flags;
   sigsave.func = (void (*)(int)) handler;
   sigsave.sig = sig;