diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62048f4661..4aeeeddeb9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 19 08:18:48 1997  Mark Alexander  <marka@cygnus.com>
+
+	* utils.c (floatformat_from_doublest): Improve test for infinity.
+
 Wed Jun 18 13:47:52 1997  Fred Fish  <fnf@cygnus.com>
 
 	* dwarfread.c (isreg, optimized_out, offreg, basereg): Move
diff --git a/gdb/utils.c b/gdb/utils.c
index e4de853151..716f92ef83 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2387,7 +2387,7 @@ floatformat_from_doublest (fmt, from, to)
       dfrom = -dfrom;
     }
 
-  if (dfrom + 1 == dfrom)	/* Result is Infinity */
+  if (dfrom + dfrom == dfrom && dfrom != 0.0)	/* Result is Infinity */
     {
       /* Infinity exponent is same as NaN's.  */
       put_field (uto, fmt->byteorder, fmt->totalsize, fmt->exp_start,