diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 6282a60b8e..b9d592c22a 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* oldsemaphore.c (__old_sem_wait): Clear p_nextwaiting before
+	returning successfully.
+	Patch by Gene Cooperman <gene@ccs.neu.edu>.
+
 2001-05-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* spinlock.c (__pthread_lock) [HAS_COMPARE_AND_SWAP]: Before doing any
diff --git a/linuxthreads/oldsemaphore.c b/linuxthreads/oldsemaphore.c
index 2099b8bbda..80a82dfcf6 100644
--- a/linuxthreads/oldsemaphore.c
+++ b/linuxthreads/oldsemaphore.c
@@ -113,7 +113,8 @@ int __old_sem_wait(old_sem_t * sem)
 	while (! sem_compare_and_swap(sem, oldstatus, newstatus));
 	if (newstatus & 1) {
 	    /* We got the semaphore. */
-	  __pthread_set_own_extricate_if(self, 0);
+	    __pthread_set_own_extricate_if(self, 0);
+	    self->p_nextwaiting = NULL;
 	    return 0;
 	}
 	/* Wait for sem_post or cancellation */