diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 64bc77c03..4601068c7 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-23  Corinna Vinschen  <corinna@vinschen.de>
+
+	* sysv_sem.cc (semundo_clear): Move condition to break from
+	inner loop to the right spot.
+
 2012-11-12  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* Makefile.in: Revamp for new configury.
diff --git a/winsup/cygserver/sysv_sem.cc b/winsup/cygserver/sysv_sem.cc
index 499c1f9e2..e7ba48b61 100644
--- a/winsup/cygserver/sysv_sem.cc
+++ b/winsup/cygserver/sysv_sem.cc
@@ -529,9 +529,9 @@ semundo_clear(int semid, int semnum, struct thread *td)
 						  suptr->un_ent[suptr->un_cnt];
 						continue;
 					}
+					if (semnum != -1)
+						break;
 				}
-				if (semnum != -1)
-					break;
 			}
 			i++, sunptr++;
 		}