diff --git a/ChangeLog b/ChangeLog
index 86fa364fa3..674201a034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 27 23:38:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (rb_home_dir): set filesystem encoding.
+
 Thu May 27 23:29:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* file.c (file_expand_path): set encoding as the same of fname
diff --git a/file.c b/file.c
index ed033a71af..7c980f3732 100644
--- a/file.c
+++ b/file.c
@@ -2828,6 +2828,7 @@ rb_home_dir(const char *user, VALUE result)
 	}
     }
 #endif
+    rb_enc_associate_index(result, rb_filesystem_encindex());
     return result;
 }