diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index de8109a4e..ba08d33d7 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-31  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* mingwex/math/cephes_emath.h (__enan_64): Fix thinko.
+	(__enan_NI16): Fix another one.
+	(__enan_NBITS): Tidy.
+
 2004-01-16  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/stdint.h  Fix __STDC_CONSTANT_MACROS for 8 and 16 bit
diff --git a/winsup/mingw/mingwex/math/cephes_emath.h b/winsup/mingw/mingwex/math/cephes_emath.h
index 67b8d816c..78112bf18 100644
--- a/winsup/mingw/mingwex/math/cephes_emath.h
+++ b/winsup/mingw/mingwex/math/cephes_emath.h
@@ -679,19 +679,23 @@ for( i=M; i<NI-1; i++ )
 
 static __inline__ void __enan_64(unsigned short* nan)
 {
-  static const unsigned short nan64[6]
-    = {0, 0, 0, 0xc000, 0xffff, 0};
-  nan = (unsigned short*) nan64;
+
+  int i;
+  for( i=0; i<3; i++ )
+    *nan++ = 0;
+  *nan++ = 0xc000;
+  *nan++ = 0x7fff;
+  *nan = 0;
   return;
 }
 
 static __inline__ void __enan_NBITS(unsigned short* nan)
 {
- int i; 
- for( i=0; i<NE-2; i++ )
+  int i; 
+  for( i=0; i<NE-2; i++ )
     *nan++ = 0;
   *nan++ = 0xc000;
-  *nan++ = 0x7fff;
+  *nan = 0x7fff;
   return;
 }
 
@@ -699,14 +703,13 @@ static __inline__ void __enan_NI16(unsigned short* nan)
 {
   int i; 
   *nan++ = 0;
-  *nan = 0x7fff;
-  *nan = 0;
-  *nan = 0xc000;
+  *nan++ = 0x7fff;
+  *nan++ = 0;
+  *nan++ = 0xc000;
   for( i=4; i<NI; i++ )
     *nan++ = 0;
   return;
 }
 
-
 #endif /* _CEPHES_EMATH_H */