diff --git a/ChangeLog b/ChangeLog
index ecad14c838..2c6648a241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  5 12:27:07 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* gem_prelude.rb (Gem.user_home): force_encoding(
+	  Encoding.find('filesystem')). [ruby-core:26525]
+
 Thu Nov  5 07:47:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (BEGIN): now local_push are local_pop are necessary in
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 519f693bb4..15a1b43fe9 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -91,7 +91,7 @@ if defined?(Gem) then
     end
 
     def self.user_home
-      @user_home ||= File.expand_path("~")
+      @user_home ||= File.expand_path("~").force_encoding(Encoding.find('filesystem'))
     rescue
       if File::ALT_SEPARATOR then
         "C:/"