diff --git a/ChangeLog b/ChangeLog
index c04b4a8628..f1795dbde4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr  3 18:34:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (Init_stack): use ruby_init_stack.  [ruby-dev:34350]
+
+	* intern.h (Init_stack): make to call ruby_init_stack.
+
 Fri Apr  3 13:53:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (is_defined): made a volatile variable not to be
diff --git a/Makefile.in b/Makefile.in
index 921be5db19..d7e0f7fd21 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,22 +128,8 @@ $(LIBRUBY_SO):
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
-		@echo ' \
-		class Object; \
-		  CROSS_COMPILING = RUBY_PLATFORM; \
-		  remove_const :RUBY_PLATFORM; \
-		  remove_const :RUBY_VERSION; \
-		  RUBY_PLATFORM = "@arch@"; \
-		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
-		end; \
-		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
-		  class File; \
-		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\"; \
-		  end; \
-		end; \
-		' > $@
+fake.rb:	config.status
+		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
 
 Makefile:	$(srcdir)/Makefile.in
 
diff --git a/configure.in b/configure.in
index 5416ba634b..3e6aab1ff1 100644
--- a/configure.in
+++ b/configure.in
@@ -1462,8 +1462,8 @@ fi
 #fi
 
 if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
-  PREP=fake.rb
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake'
+  PREP='$(arch)-fake.rb'
   RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
diff --git a/template/fake.rb.in b/template/fake.rb.in
new file mode 100644
index 0000000000..ed9416a16f
--- /dev/null
+++ b/template/fake.rb.in
@@ -0,0 +1,15 @@
+class Object
+  CROSS_COMPILING = RUBY_PLATFORM
+  remove_const :RUBY_PLATFORM
+  remove_const :RUBY_VERSION
+  remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION)
+  RUBY_PLATFORM = "@arch@"
+  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"
+  RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{Time.now.strftime("%Y-%m-%d")}) [#{RUBY_PLATFORM}]"
+end
+if RUBY_PLATFORM =~ /mswin|bccwin|mingw/
+  class File
+    remove_const :ALT_SEPARATOR
+    ALT_SEPARATOR = "\\"
+  end
+end