diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index 2ee5b08a5f..3568d0945b 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-13	Joel Sherrill <joel@OARcorp.com>
+
+	* src/threadloadenv.c: Removed warnings.
+
 2003-06-12	Joel Sherrill <joel@OARcorp.com>
 
 	* src/objectmp.c: Removed warnings.
diff --git a/cpukit/score/src/threadloadenv.c b/cpukit/score/src/threadloadenv.c
index af1233f709..a625c27f0d 100644
--- a/cpukit/score/src/threadloadenv.c
+++ b/cpukit/score/src/threadloadenv.c
@@ -43,15 +43,17 @@ void _Thread_Load_environment(
   Thread_Control *the_thread
 )
 {
-  boolean is_fp = FALSE;
+  boolean is_fp;
 
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
   if ( the_thread->Start.fp_context ) {
     the_thread->fp_context = the_thread->Start.fp_context;
     _Context_Initialize_fp( &the_thread->fp_context );
     is_fp = TRUE;
-  }
+  } else
 #endif
+    is_fp = FALSE;
+
 
   the_thread->do_post_task_switch_extension = FALSE;
   the_thread->is_preemptible   = the_thread->Start.is_preemptible;