diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e61c43ff2..a0c7fb404 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-19  Corinna Vinschen  <corinna@vinschen.de>
+
+	* mmap.cc (mmap64): Make granularity an automatic variable.
+
 2005-05-19  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler.h (fhandler_cygdrive::seekdir): Delete declaration.
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
index ec4e3c294..a3c5f1356 100644
--- a/winsup/cygwin/mmap.cc
+++ b/winsup/cygwin/mmap.cc
@@ -506,7 +506,7 @@ mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
   syscall_printf ("addr %x, len %u, prot %x, flags %x, fd %d, off %D",
 		  addr, len, prot, flags, fd, off);
 
-  static DWORD granularity = getshmlba ();
+  DWORD granularity = getshmlba ();
 
   /* Error conditions according to SUSv2 */
   if (off % getpagesize ()