diff --git a/ChangeLog b/ChangeLog
index 404169f1df..69dce621b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/aio_suspend.c (aio_suspend): Set errno to EINTR
+	if this is what pthread_cond_wait returned.
+
 2003-06-20  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/unix/make-syscalls.sh: Implement ! prefix for strong aliases.
diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c
index 1b09aef028..92cac81036 100644
--- a/sysdeps/pthread/aio_suspend.c
+++ b/sysdeps/pthread/aio_suspend.c
@@ -199,6 +199,8 @@ aio_suspend (list, nent, timeout)
 	 form expected from `aio_suspend'.  */
       if (result == ETIMEDOUT)
 	__set_errno (EAGAIN);
+      else if (result == EINTR)
+	__set_errno (EINTR);
 
       result = -1;
     }