diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 078e5de3e..9a2750b86 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* errno.cc (errmap): Map ERROR_INVALID_ADDRESS to EINVAL instead of
+	EOVERFLOW.
+
 2004-12-10  Christopher Faylor  <cgf@timesys.com>
 
 	* include/sys/strace.h: Don't output paranoid_printf by default.
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
index b730e9578..fb7923c16 100644
--- a/winsup/cygwin/errno.cc
+++ b/winsup/cygwin/errno.cc
@@ -112,7 +112,7 @@ static NO_COPY struct
   X (DISK_FULL,			ENOSPC),
   X (NOACCESS,			EFAULT),
   X (FILE_INVALID,		ENXIO),
-  X (INVALID_ADDRESS,		EOVERFLOW),
+  X (INVALID_ADDRESS,		EINVAL),
   X (INVALID_BLOCK_LENGTH,	EIO),
   X (BUS_RESET,			EIO),
   X (FILEMARK_DETECTED,		EIO),