diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 82257cabd..26d52d64f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* exceptions.cc (sigpacket::process): Simplify code slightly.
+
 2004-03-11  Christopher Faylor  <cgf@redhat.com>
 
 	* cygtls.h (waitq): Declare structure here.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index bf6409a25..5ad6642a6 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1041,6 +1041,7 @@ sigpacket::process ()
   if (handler == (void *) SIG_ERR)
     goto exit_sig;
 
+  tls->set_siginfo (this);
   goto dosig;
 
 stop:
@@ -1049,11 +1050,8 @@ stop:
     goto done;
   handler = (void *) sig_handle_tty_stop;
   thissig = global_sigs[SIGSTOP];
-  goto dosig1;
 
 dosig:
-  tls->set_siginfo (this);
-dosig1:
   /* Dispatch to the appropriate function. */
   sigproc_printf ("signal %d, about to call %p", si.si_signo, handler);
   rc = setup_handler (si.si_signo, handler, thissig, tls);