diff --git a/ChangeLog b/ChangeLog
index abc4797242..98613cb60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 23 10:33:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/fake.rb.in (ruby): suppress warnings.
+
 Sun Jan 23 08:00:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (str_nth_len, str_utf8_nth): return the rest length together.
diff --git a/template/fake.rb.in b/template/fake.rb.in
index cdc999a821..5bbb3353bf 100755
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -1,7 +1,12 @@
 baseruby="@BASERUBY@"
 ruby="${RUBY-$baseruby}"
-"eval" "{ `expr \"$ruby\" : echo > /dev/null || echo exec` $ruby "'-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' "}" || "exit" "$?"
+"eval" "{" \
+"`expr \"$ruby\" : echo > /dev/null || echo exec`" \
+"$ruby" '-r"`expr \"$0\" : / > /dev/null || pwd`/${0#/}" "$@";' \
+"}" || "exit" "$?"
+ruby=ruby
 class Object
+  remove_const :CROSS_COMPILING
   CROSS_COMPILING = RUBY_PLATFORM
   remove_const :RUBY_PLATFORM
   remove_const :RUBY_VERSION
@@ -19,7 +24,6 @@ end
 
 $:.unshift(File.expand_path("..", __FILE__))
 posthook = proc do
-  config = RbConfig::CONFIG
   mkconfig = RbConfig::MAKEFILE_CONFIG
   extout = File.expand_path(mkconfig["EXTOUT"], mkconfig["builddir"])
   $arch_hdrdir = "#{extout}/include/$(arch)"