diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 5fc7a8e94..7e930edfc 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-21  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/math.h (float_t, double_t): Define.
+
 2008-02-08  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* mingwex/gdtoa/gdtoaimp.h (USE_LOCALE): Define.
diff --git a/winsup/mingw/include/math.h b/winsup/mingw/include/math.h
index 788c2449a..abe899e4a 100644
--- a/winsup/mingw/include/math.h
+++ b/winsup/mingw/include/math.h
@@ -304,6 +304,24 @@ extern const double __QNAN;
 #define NAN __QNAN
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
 
+/* Use the compiler's builtin define for FLT_EVAL_METHOD to
+   set float_t and double_t.  */
+#if defined(__FLT_EVAL_METHOD__)  
+# if ( __FLT_EVAL_METHOD__== 0)
+typedef float float_t;
+typedef double double_t;
+# elif (__FLT_EVAL_METHOD__ == 1)
+typedef double float_t;
+typedef double double_t;
+# elif (__FLT_EVAL_METHOD__ == 2)
+typedef long double float_t;
+typedef long double double_t;
+#endif
+#else /* ix87 FPU default */
+typedef long double float_t;
+typedef long double double_t;
+#endif
+
 /* 7.12.3.1 */
 /*
    Return values for fpclassify.