diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 777e1af99..765e5d23e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-19  Corinna Vinschen  <corinna@vinschen.de>
+
+	* mmap.cc (msync): Disable rounding up len.  Fix bug in access check
+	loop.
+
 2006-07-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (symlink_worker): Return EEXIST if newpath exists.
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
index 5ace55c0a..97966515e 100644
--- a/winsup/cygwin/mmap.cc
+++ b/winsup/cygwin/mmap.cc
@@ -1352,7 +1352,9 @@ msync (void *addr, size_t len, int flags)
       set_errno (EINVAL);
       goto out;
     }
+#if 0 /* If I only knew why I did that... */
   len = roundup2 (len, pagesize);
+#endif
 
   /* Iterate through the map, looking for the mmapped area.
      Error if not found. */
@@ -1368,7 +1370,7 @@ msync (void *addr, size_t len, int flags)
 	  if (rec->access ((caddr_t)addr))
 	    {
 	      /* Check whole area given by len. */
-	      for (DWORD i = getpagesize (); i < len; ++i)
+	      for (DWORD i = getpagesize (); i < len; i += getpagesize ())
 		if (!rec->access ((caddr_t)addr + i))
 		  {
 		    set_errno (ENOMEM);