diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 9c37906467..7c88aa5a16 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* tst-eintr2.c (do_test): make sure that if mutex_lock in main
+	thread returns the program exits with an error code.
+
 2008-01-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* pthread-errnos.sym: Add EOVERFLOW.
diff --git a/nptl/tst-eintr2.c b/nptl/tst-eintr2.c
index 8cbbc5a026..b7436a66ac 100644
--- a/nptl/tst-eintr2.c
+++ b/nptl/tst-eintr2.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
 
@@ -109,7 +109,7 @@ do_test (void)
   printf ("main: mutex_lock returned: %s\n",
 	  strerror_r (e, buf, sizeof (buf)));
 
-  return 0;
+  return 1;
 }
 
 #define EXPECTED_SIGNAL SIGALRM