diff --git a/ChangeLog b/ChangeLog
index 7d3e361b45..151b7f6413 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-08-13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* stdio-common/vfscanf.c: Don't recognize hexadecimal floats with
+	exponent.
+
+1999-08-10  Andreas Schwab  <schwab@suse.de>
+
+	* elf/dl-load.c (_dl_map_object_from_fd): Fix check for valid elf
+	header.
+
 1999-08-09  Scott Bambrough  <scottb@netwinder.org>
 
 	* elf/elf.h: Added definition of ELFOSABI_ARM.
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index a494bfaa3b..846542fc61 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1410,8 +1410,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 
 	  /* Have we read any character?  If we try to read a number
 	     in hexadecimal notation and we have read only the `0x'
-	     prefix this is an error.  */
-	  if (wpsize == 0 || (is_hexa && wpsize == 2))
+	     prefix or no exponent this is an error.  */
+	  if (wpsize == 0 || (is_hexa && (wpsize == 2 || ! got_e)))
 	    conv_error ();
 
 	scan_float: