diff --git a/ChangeLog b/ChangeLog
index 048dc7e53d..552a35030c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 18 15:27:20 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_path_convert): delay getting filesystem encoding
+	  while really needed.
+
 Wed Nov 18 12:33:42 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* encoding.c (enc_set_default_encoding): reset filesytem
diff --git a/file.c b/file.c
index 314ba82959..6d893316b3 100644
--- a/file.c
+++ b/file.c
@@ -107,7 +107,7 @@ VALUE
 file_path_convert(VALUE name)
 {
     rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name));
-    rb_encoding *fs_encoding = rb_filesystem_encoding();
+    rb_encoding *fs_encoding;
 #ifdef __APPLE__
     static rb_encoding *utf8mac_encoding;
     if (!utf8mac_encoding)
@@ -116,14 +116,14 @@ file_path_convert(VALUE name)
 	    && rb_ascii8bit_encoding() != fname_encoding
 	    && rb_utf8_encoding() != fname_encoding
 	    && utf8mac_encoding != fname_encoding
-	    && fs_encoding != fname_encoding) {
+	    && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) {
 	name = rb_str_conv_enc(name, fname_encoding, fs_encoding);
     }
 #elif !defined(_WIN32)
     if (rb_default_internal_encoding() != NULL
 	    && rb_usascii_encoding() != fname_encoding
 	    && rb_ascii8bit_encoding() != fname_encoding
-	    && fs_encoding != fname_encoding) {
+	    && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) {
 	name = rb_str_conv_enc(name, fname_encoding, fs_encoding);
     }
 #endif