diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aa8a993b9..64347c435 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* setup_handler (setup_handler): Change break to goto out, missed in
+	2011-07-06 changes.
+
 2011-07-10  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
 	* fhandler_tty.cc (fhandler_pty_slave::ioctl): Remove erroneous support
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 638c6e3b8..d9d7f5059 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -861,7 +861,7 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
 	      tls->interrupt_setup (sig, handler, siga);
 	      interrupted = true;
 	      tls->unlock ();
-	      break;
+	      goto out;
 	    }
 
 	  DWORD res;