diff --git a/ChangeLog b/ChangeLog
index 921e0cf6d7..c5b7c5be46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 18 17:10:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (move_to_next_entry): loc also must move forward.
+	  [ruby-talk:251987]
+
+
 Fri May 18 03:02:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/mkexports.rb: preserve prefixed underscores for WINAPI
diff --git a/win32/win32.c b/win32/win32.c
index ba0a26b602..99cec1cc93 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1541,6 +1541,7 @@ static void
 move_to_next_entry(DIR *dirp)
 {
     if (dirp->curr) {
+	dirp->loc++;
 	dirp->curr += strlen(dirp->curr) + 1;
 	if (dirp->curr >= (dirp->start + dirp->size)) {
 	    dirp->curr = NULL;