diff --git a/ChangeLog b/ChangeLog
index 160a46dd25..393cbeda4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 18 17:38:51 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* dir.c (glob_helper): check whether path is "" before calling
+	  do_opendir.  [ruby-dev:26183]
+
 Wed May 18 13:40:48 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (NtInitialize): fix typo.
diff --git a/dir.c b/dir.c
index df1880eec4..bd9ea02a50 100644
--- a/dir.c
+++ b/dir.c
@@ -1263,7 +1263,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 
     if (magical || recursive) {
 	struct dirent *dp;
-	DIR *dirp = do_opendir(path);
+	DIR *dirp = do_opendir(*path ? path : ".");
 	if (dirp == NULL) return 0;
 
 	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {