diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index 4733b975ed..38d5095d29 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-19	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* rtems/score/cpu.h: Fix type when initializing FP context.
+
 2008-08-19	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* cpu.c, rtems/score/cpu.h: Add extern for bfffo table and rename it to
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index b87ba8adef..1c46478cd8 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -442,18 +442,18 @@ uint32_t   _CPU_ISR_Get_level( void );
 
 #if (defined(__mcoldfire__) && ( M68K_HAS_FPU == 1 ))
 #define _CPU_Context_Initialize_fp( _fp_area ) \
-   { uint32_t   *_fp_context = (uint32_t   *)*(_fp_area); \
+   { uint32_t   *_fp_context = (uint32_t *)*(_fp_area); \
      \
      *(--(_fp_context)) = 0; \
-     *(_fp_area) = (uint8_t   *)(_fp_context); \
+     *(_fp_area) = (void *)(_fp_context); \
      asm volatile("movl %0,%%macsr": : "d" (0) ); \
    }
 #else
 #define _CPU_Context_Initialize_fp( _fp_area ) \
-   { uint32_t   *_fp_context = (uint32_t   *)*(_fp_area); \
+   { uint32_t   *_fp_context = (uint32_t *)*(_fp_area); \
      \
      *(--(_fp_context)) = 0; \
-     *(_fp_area) = (uint8_t   *)(_fp_context); \
+     *(_fp_area) = (void *)(_fp_context); \
    }
 #endif
 #endif