diff --git a/ChangeLog b/ChangeLog
index 342a2a15ee..6d054f1189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-06  Ulrich Drepper  <drepper@redhat.com>
 
+	* test-skeleton.c (main): Use TEMP_FAILURE_RETRY with waitpid.
+
 	* sysdeps/unix/sysv/linux/i386/sysdep.h (ASMFMT_2): Only allow
 	%edx for first parameter.  This means no pushl and therefore the
 	unwind info isn't screwed up.
diff --git a/test-skeleton.c b/test-skeleton.c
index 64297fa988..c2eff6ba5e 100644
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -290,11 +290,11 @@ main (int argc, char *argv[])
   /* Default timeout is two seconds.  */
 # define TIMEOUT 2
 #endif
-  alarm (TIMEOUT);
   signal (SIGALRM, timeout_handler);
+  alarm (TIMEOUT);
 
   /* Wait for the regular termination.  */
-  termpid = waitpid (pid, &status, 0);
+  termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0));
   if (termpid == -1)
     {
       printf ("Waiting for test program failed: %m\n");