diff --git a/ChangeLog b/ChangeLog
index 8db10d9a50..dd142520c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb  8 16:23:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
+
+	* tool/eval.rb, win32/{mkexports,resource}.rb: miniruby no longer
+	  contains "." in $:.
+
 Mon Feb  8 10:28:58 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: check pthread_attr_getstack to prevent obsolete
diff --git a/common.mk b/common.mk
index 559b4908ee..0c31756996 100644
--- a/common.mk
+++ b/common.mk
@@ -123,7 +123,7 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb
 
 BOOTSTRAPRUBY = $(BASERUBY)
 
-COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -r./rbconfig $(srcdir)/tool/compile_prelude.rb
+COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
 
 all: main docs
 
diff --git a/tool/eval.rb b/tool/eval.rb
index f7299c8b95..ced244a4da 100755
--- a/tool/eval.rb
+++ b/tool/eval.rb
@@ -1,5 +1,5 @@
 
-require 'rbconfig'
+require './rbconfig'
 require 'fileutils'
 require 'pp'
 
diff --git a/win32/mkexports.rb b/win32/mkexports.rb
index 6ef20eab69..951429e35a 100755
--- a/win32/mkexports.rb
+++ b/win32/mkexports.rb
@@ -3,7 +3,7 @@
 $name = $library = $description = nil
 
 module RbConfig
-  autoload :CONFIG, "rbconfig"
+  autoload :CONFIG, "./rbconfig"
 end
 
 class Exports
diff --git a/win32/resource.rb b/win32/resource.rb
index eda450952b..786edb0dd6 100755
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -1,6 +1,6 @@
 #!./miniruby -sI.
 
-require 'rbconfig'
+require './rbconfig'
 
 CONFIG = RbConfig::MAKEFILE_CONFIG