diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 83e32fa6e..6d8ec651f 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-10  Stephen Huw Clarke  <stephen.clarke@st.com>
+
+	* libm/common/sf_fmax.c: Fix to properly handle NaNs.
+	* libm/common/s_max.c: Ditto.
+	* libm/common/sf_fmin.c: Ditto.
+	* libm/common/s_min.c: Ditto.
+
 2005-08-10  DJ Delorie  <dj@redhat.com>
 
 	* configure.host: Add m32c support.
diff --git a/newlib/libm/common/s_fmax.c b/newlib/libm/common/s_fmax.c
index 2de04efab..53e1559e3 100644
--- a/newlib/libm/common/s_fmax.c
+++ b/newlib/libm/common/s_fmax.c
@@ -17,9 +17,9 @@
 #endif
 {
   if (__fpclassifyd(x) == FP_NAN)
-    return x;
-  if (__fpclassifyd(y) == FP_NAN)
     return y;
+  if (__fpclassifyd(y) == FP_NAN)
+    return x;
   
   return x > y ? x : y;
 }
diff --git a/newlib/libm/common/s_fmin.c b/newlib/libm/common/s_fmin.c
index f9eb51cdd..65e0b1c6d 100644
--- a/newlib/libm/common/s_fmin.c
+++ b/newlib/libm/common/s_fmin.c
@@ -17,9 +17,9 @@
 #endif
 {
   if (__fpclassifyd(x) == FP_NAN)
-    return x;
-  if (__fpclassifyd(y) == FP_NAN)
     return y;
+  if (__fpclassifyd(y) == FP_NAN)
+    return x;
   
   return x < y ? x : y;
 }
diff --git a/newlib/libm/common/sf_fmax.c b/newlib/libm/common/sf_fmax.c
index 292b99edf..ac1bf46f5 100644
--- a/newlib/libm/common/sf_fmax.c
+++ b/newlib/libm/common/sf_fmax.c
@@ -15,9 +15,9 @@
 #endif
 {
   if (__fpclassifyf(x) == FP_NAN)
-    return x;
-  if (__fpclassifyf(y) == FP_NAN)
     return y;
+  if (__fpclassifyf(y) == FP_NAN)
+    return x;
   
   return x > y ? x : y;
 }
diff --git a/newlib/libm/common/sf_fmin.c b/newlib/libm/common/sf_fmin.c
index 4ef3510aa..f0e344455 100644
--- a/newlib/libm/common/sf_fmin.c
+++ b/newlib/libm/common/sf_fmin.c
@@ -15,9 +15,9 @@
 #endif
 {
   if (__fpclassifyf(x) == FP_NAN)
-    return x;
-  if (__fpclassifyf(y) == FP_NAN)
     return y;
+  if (__fpclassifyf(y) == FP_NAN)
+    return x;
   
   return x < y ? x : y;
 }