diff --git a/ChangeLog b/ChangeLog
index 639f5b0685..f58c58d273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 13 14:57:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_mod_autoload): try conversion to path like as
+	  require.  [ruby-core:23834]
+
 Sat Jun 13 09:58:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* marshal.c (r_ivar): should not set internal encoding ivar as an
diff --git a/load.c b/load.c
index 5f9d4f2294..645dca2040 100644
--- a/load.c
+++ b/load.c
@@ -654,7 +654,7 @@ rb_mod_autoload(VALUE mod, VALUE sym, VALUE file)
 {
     ID id = rb_to_id(sym);
 
-    Check_SafeStr(file);
+    FilePathValue(file);
     rb_autoload(mod, id, RSTRING_PTR(file));
     return Qnil;
 }