diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 5acc959e20..5854948399 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makefile (tests): Add tst-exit2.
+	* tst-exit2.c: New file.
+
 2004-11-09  Roland McGrath  <roland@redhat.com>
 
 	[BZ #530]
diff --git a/nptl/tst-exit2.c b/nptl/tst-exit2.c
new file mode 100644
index 0000000000..3f5ff27b0f
--- /dev/null
+++ b/nptl/tst-exit2.c
@@ -0,0 +1,40 @@
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+
+static void *
+tf (void *arg)
+{
+  while (1)
+    sleep (100);
+
+  /* NOTREACHED */
+  return NULL;
+}
+
+
+static int
+do_test (void)
+{
+  pthread_t th;
+
+  int e = pthread_create (&th, NULL, tf, NULL);
+  if (e != 0)
+    {
+      printf ("create failed: %s\n", strerror (e));
+      return 1;
+    }
+
+  /* Terminate only this thread.  */
+  pthread_exit (NULL);
+
+  /* NOTREACHED */
+  return 1;
+}
+
+#define EXPECTED_SIGNAL SIGALRM
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"