diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index dfeaf39dc..b990d9f15 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-03  Corinna Vinschen  <corinna@vinschen.de>
+
+	* sigproc.cc (pending_signals::clear): Fix previous fix resulting in
+	yet another endless loop.
+
 2015-11-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/netinet/ip.h (MAX_IPOPTLEN): Define.
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index fbc738d4f..6a7708f0c 100644
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -402,16 +402,11 @@ sig_clear (int sig)
 void
 pending_signals::clear (_cygtls *tls)
 {
-  sigpacket *q = &start, *qnext;
+  sigpacket *q, *qnext;
 
-  while ((qnext = q->next))
-    {
-      if (qnext->sigtls == tls)
-	{
-	  q->next = qnext->next;
-	  qnext->si.si_signo = 0;
-	}
-    }
+  for (q = &start; (qnext = q->next); q->next = qnext->next)
+    if (qnext->sigtls == tls)
+      qnext->si.si_signo = 0;
 }
 
 /* Clear pending signals of specific thread.  Called from _cygtls::remove */