diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index d8bc2cfd90..fcb9f9a6c8 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/pthread/timer_create.c (timer_create): Correct names of
+	CPUTIME clock ID.  Add support for thread clocks.
+
 	* sysdeps/pthread/posix-timer.h (timer_ptr2id): Operands in
 	subtraction were switched.
 
diff --git a/linuxthreads/sysdeps/pthread/timer_create.c b/linuxthreads/sysdeps/pthread/timer_create.c
index 84e5cfed2f..d6d756d2a6 100644
--- a/linuxthreads/sysdeps/pthread/timer_create.c
+++ b/linuxthreads/sysdeps/pthread/timer_create.c
@@ -21,6 +21,7 @@
 #include <signal.h>
 #include <pthread.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "posix-timer.h"
 
@@ -38,7 +39,10 @@ timer_create (clock_id, evp, timerid)
 
   if (clock_id != CLOCK_REALTIME
 #ifdef _POSIX_CPUTIME
-      && clock_id != CLOCK_CPUTIME
+      && clock_id != CLOCK_PROCESS_CPUTIME_ID
+#endif
+#ifdef _POSIX_THREAD_CPUTIME
+      && clock_id != CLOCK_THREAD_CPUTIME_ID
 #endif
       )
     {