diff --git a/ChangeLog b/ChangeLog
index 7fbb07a56f..27909aed6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 28 10:42:50 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* gem_prelude.rb: considers --program-suffix and prefix configure
+	  options.
+
+	* lib/rubygems/defaults.rb: ditto.
+
 Tue Oct 28 09:51:48 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* bootstraptest/test_thread.rb: ignore some exceptions.
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 422110224b..7c54bdd9d3 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -113,7 +113,7 @@ if defined?(Gem) then
           undef_method :gem if method_defined? :gem
         end
 
-        $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
+        $".delete File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name], 
                             Gem::ConfigMap[:ruby_version], 'rubygems.rb')
 
         require 'rubygems'
@@ -230,7 +230,7 @@ if defined?(Gem) then
 
   begin
     Gem.push_all_highest_version_gems_on_load_path
-    $" << File.join(Gem::ConfigMap[:libdir], "ruby",
+    $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
                     Gem::ConfigMap[:ruby_version], "rubygems.rb")
   rescue Exception => e
     puts "Error loading gem paths on load path in gem_prelude"
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index c894bf41be..315d12a484 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -21,7 +21,7 @@ module Gem
       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
                 ConfigMap[:ruby_version]
     else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+      File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], 'gems',
                 ConfigMap[:ruby_version])
     end
   end