diff --git a/ChangeLog b/ChangeLog
index 35cf986dfd..9071025693 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Feb 27 21:36:47 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
+
+Tue Feb 27 21:33:04 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
+
 Tue Feb 27 20:35:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* common.mk (error.c, process.c): depend on yarvcore.h and rubysig.h.
diff --git a/configure.in b/configure.in
index 46f5af352a..323e6e4f88 100644
--- a/configure.in
+++ b/configure.in
@@ -435,6 +435,7 @@ msdosdjgpp*)	LIBS="-lm $LIBS"
 		ac_cv_func_setitimer=no
 		ac_cv_sizeof_rlim_t=4
 		ac_cv_func_fork=no
+		ac_cv_func_setrlimit=no
 		;;
 bsdi*)          LIBS="-lm $LIBS"
                 ac_cv_sizeof_rlim_t=8;;
diff --git a/util.c b/util.c
index 6c16aaed43..c949a98e6e 100644
--- a/util.c
+++ b/util.c
@@ -347,7 +347,7 @@ __crt0_glob_function(char *path)
     info.count = 0;
     info.head = 0;
 
-    rb_glob(buf, push_element, (VALUE)&info);
+    ruby_glob(buf, 0, push_element, (VALUE)&info);
 
     if (buf != path_buffer)
 	ruby_xfree(buf);