diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 7027fa9b0bc..6807a7b0fff 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Per Bothner  <per@bothner.com>
+
+	* strtod.c (_strtod_r):  Logic to check for missing digits
+	after exponent had 'else' attached to wrong 'if'.
+
 2001-10-09  Mark Wielaard  <mark@klomp.org>
 
 	* java/net/SocketImpl.java: Merge with Classpath
diff --git a/libjava/java/lang/strtod.c b/libjava/java/lang/strtod.c
index e0e8e74828b..1777b1aae8a 100644
--- a/libjava/java/lang/strtod.c
+++ b/libjava/java/lang/strtod.c
@@ -242,16 +242,15 @@ dig_done:
 	      if (esign)
 		e = -e;
 	    }
-	  else
-	    {
-	      /* No exponent after an 'E' : that's an error. */
-	      ptr->_errno = EINVAL;
-	      e = 0;
-	      goto ret;
-	    }
 	}
       else
-	s = s00;
+	{
+	  /* No exponent after an 'E' : that's an error. */
+	  ptr->_errno = EINVAL;
+	  e = 0;
+	  s = s00;
+	  goto ret;
+	}
     }
   if (!nd)
     {