diff --git a/ChangeLog b/ChangeLog
index d427307870..5d75122e70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 28 14:29:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (load_lib): use dln_find_file_r instead of dln_find_file.
+
 Mon Jul 28 00:18:47 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* vm_core.h, thread.c: It is now prohibited to use Data_Get_Struct in
diff --git a/dln.c b/dln.c
index c19c42125c..6fc97787e6 100644
--- a/dln.c
+++ b/dln.c
@@ -911,7 +911,7 @@ char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
 static int
 load_lib(const char *lib)
 {
-    char *path, *file;
+    char *path, *file, fbuf[MAXPATHLEN];
     char armagic[SARMAG];
     int fd, size;
     struct ar_hdr ahdr;
@@ -942,7 +942,7 @@ load_lib(const char *lib)
     path = getenv("DLN_LIBRARY_PATH");
     if (path == NULL) path = dln_librrb_ary_path;
 
-    file = dln_find_file(lib, path);
+    file = dln_find_file_r(lib, path, fbuf, sizeof(fbuf));
     fd = open(file, O_RDONLY);
     if (fd == -1) goto syserr;
     size = read(fd, armagic, SARMAG);