diff --git a/ChangeLog b/ChangeLog
index 1add9776e5..8838217fe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 21 23:07:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in: get rid of embeding an absolute path.
+
 Wed Jul 21 15:22:17 2010  Evan Phoenix <evan@fallingsnow.net>
 
 	* lib/rubygems/custom_require.rb, gem_prelude.rb: Load code from
diff --git a/template/fake.rb.in b/template/fake.rb.in
index e47cb4d759..cdc999a821 100755
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -30,9 +30,10 @@ prehook = proc do |extmk|
   unless extmk
     config = RbConfig::CONFIG
     mkconfig = RbConfig::MAKEFILE_CONFIG
-    mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@abs_top_srcdir@")
+    builddir = File.expand_path(File.dirname(__FILE__))
+    mkconfig["top_srcdir"] = $top_srcdir = File.expand_path("@top_srcdir@", builddir)
     mkconfig["rubyhdrdir"] = "$(top_srcdir)/include"
-    mkconfig["builddir"] = config["builddir"] = File.expand_path(File.dirname(__FILE__))
+    mkconfig["builddir"] = config["builddir"] = builddir
     config["rubyhdrdir"] = File.join(mkconfig["top_srcdir"], "include")
     mkconfig["libdir"] = config["libdir"] = mkconfig["topdir"]
     trace_var(:$ruby, posthook)