diff --git a/ChangeLog b/ChangeLog
index 86ea82a1bc..6591a69666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* dir.c (dir_each): rewinddir(3) before iteration.
+	  [ruby-talk:149628]
+
 Tue Jul 26 18:11:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h: support LLP64 model.  [ruby-talk:149524]
diff --git a/dir.c b/dir.c
index 4a7025e428..ce0e88b242 100644
--- a/dir.c
+++ b/dir.c
@@ -409,6 +409,7 @@ dir_each(dir)
     struct dirent *dp;
 
     GetDIR(dir, dirp);
+    rewinddir(dirp->dir);
     for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
 	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
 	if (dirp->dir == NULL) dir_closed();