diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3fb4372ac..3c489d194 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2015-10-30  Corinna Vinschen  <corinna@vinschen.de>
 
+	* exceptions.cc (sigpacket::process): Avoid potentially double unlocking
+	the TLS mutex.
+
+2015-10-30  Corinna Vinschen  <corinna@vinschen.d>
+
 	* signal.cc (sigwait): Fix return value to reflect errno in case of
 	error according to POSIX.  Never return EINTR.
 	* thread.cc (pthread_kill): Return errno if sig_send failed.
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 60f09d654..9119a8c08 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1475,10 +1475,7 @@ sigpacket::process ()
 	  else if (!sigismember (&tls->sigmask, si.si_signo))
 	    issig_wait = false;
 	  else
-	    {
-	      cygheap->unlock_tls (tl_entry);
-	      tls = NULL;
-	    }
+	    tls = NULL;
 	}
     }