diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 259ce4086c..9f2645d753 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-25	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* posix/src/pthread.c: Make default pthread_attr_t match the
+	conditionals in the version in newlib. This way it will always be
+	right.
+
 2010-04-25	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* libcsupport/src/readv.c: Check for < 0 on iov_len, not <= 0. A
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index 6db3b08ced..45d0ff18fd 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -48,12 +48,17 @@ const pthread_attr_t _POSIX_Threads_Default_attributes = {
   SCHED_FIFO,                 /* schedpolicy */
   {                           /* schedparam */
     2,                        /* sched_priority */
-    0,                        /* sched_ss_low_priority */
-    { 0L, 0 },                /* sched_ss_repl_period */
-    { 0L, 0 }                 /* sched_ss_init_budget */
+    #if defined(_POSIX_SPORADIC_SERVER) || \
+        defined(_POSIX_THREAD_SPORADIC_SERVER)
+      0,                        /* sched_ss_low_priority */
+      { 0L, 0 },                /* sched_ss_repl_period */
+      { 0L, 0 }                 /* sched_ss_init_budget */
+    #endif
   },
+  #if defined(_POSIX_THREAD_CPUTIME)
+    1,                        /* cputime_clock_allowed */
+  #endif
   PTHREAD_CREATE_JOINABLE,    /* detachstate */
-  1                           /* cputime_clock_allowed */
 };
 
 /*