diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 970294bbd..1bfd591f2 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-26  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* mingwex/stdio/vsscanf: Add "edi" to registers-modified field
+	* mingwex/stdio/vfscanf: Likewise.
+	* mingwex/stdio/vswscanf: Likewise.
+	* mingwex/stdio/vfwscanf: Likewise.
+
 2004-07-26  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/_mingw.h: Use only two underscores to uglify
@@ -19,7 +26,7 @@
 	* include/_mingw.h (__MINGW_ATTR_*):  Replace with
 	__MINGW_ATTRIB_*.
 	* include/stdlib.h (_ATTRIB_NORETURN): Replace with
-	__MINGW_ATTRIB_NOREURN, throughout.
+	__MINGW_ATTRIB_NORETURN, throughout.
 	(malloc): Declare with __MINGW_ATTRIB_MALLOC.
 	(calloc): Likewise.
 	(abs): Declare with __MINGW_ATTRIB_CONST.
diff --git a/winsup/mingw/mingwex/stdio/vfscanf.c b/winsup/mingw/mingwex/stdio/vfscanf.c
index 41549f9e4..3c1b137a8 100644
--- a/winsup/mingw/mingwex/stdio/vfscanf.c
+++ b/winsup/mingw/mingwex/stdio/vfscanf.c
@@ -34,7 +34,7 @@ int vfscanf(FILE * __restrict__ stream, const char * __restrict__ format, va_lis
     : "=a"(ret), "=c"(stream), "=d"(format)
     : "1"(stream), "2"(format), "S"(arg),
       "a"(&ret)
-    : "ebx");
+    : "ebx", "edi");
 
   return ret;
 }
diff --git a/winsup/mingw/mingwex/stdio/vfwscanf.c b/winsup/mingw/mingwex/stdio/vfwscanf.c
index 8fa33376e..2a1d095bc 100644
--- a/winsup/mingw/mingwex/stdio/vfwscanf.c
+++ b/winsup/mingw/mingwex/stdio/vfwscanf.c
@@ -36,7 +36,7 @@ int vfwscanf(FILE * __restrict__ stream, const wchar_t * __restrict__ format,
     : "=a"(ret), "=c"(stream), "=d"(format)
     : "1"(stream), "2"(format), "S"(arg),
       "a"(&ret)
-    : "ebx");
+    : "ebx", "edi");
 
   return ret;
 }