diff --git a/ChangeLog b/ChangeLog
index 31cc4804b5..33ca79a267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 29 04:41:44 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ruby.c (process_options): call rb_filesystem_encoding().
+
 Thu Oct 29 04:40:36 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* io.c (Init_IO): rb_default_rs should be US-ASCII.
diff --git a/ruby.c b/ruby.c
index 4c2d566643..8c7e88b228 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1302,6 +1302,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
     ruby_init_loadpath_safe(opt->safe_level);
     rb_enc_find_index("encdb");
     lenc = rb_locale_encoding();
+    (void)rb_filesystem_encoding();
     rb_enc_associate(rb_progname, lenc);
     parser = rb_parser_new();
     if (opt->dump & DUMP_BIT(yydebug)) {