diff --git a/ChangeLog b/ChangeLog
index ef0a2134ff..63211ba44e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 21 17:15:38 2008  Tanaka Akira  <akr@fsij.org>
+
+	* encoding.c (rb_filesystem_encoding): use locale encoding on Unix.
+	  [ruby-dev:35617]
+
 Mon Jul 21 15:29:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* missing/vsnprintf.c (struct __sbuf, FILE): use size_t.
diff --git a/encoding.c b/encoding.c
index 620f67aea3..db6cd31ec9 100644
--- a/encoding.c
+++ b/encoding.c
@@ -967,7 +967,7 @@ rb_filesystem_encoding(void)
 #elif defined __APPLE__
 	enc = rb_enc_find("UTF8-MAC");
 #else
-	enc = rb_ascii8bit_encoding();
+	enc = rb_locale_encoding();
 #endif
     }
     return enc;