diff --git a/ChangeLog b/ChangeLog
index 484427f62a..f80ecaf881 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb: should not use the libraries under the source directory
+	  at cross compiling.
+
 Thu Dec 27 23:43:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than
diff --git a/mkconfig.rb b/mkconfig.rb
index 8561bbf0e2..7815dd1eee 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -5,7 +5,8 @@ $install_name ||= nil
 $so_name ||= nil
 
 srcdir = File.dirname(__FILE__)
-$:.replace [srcdir+"/lib", "."]
+$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
+$:.unshift(".")
 
 require "fileutils"
 mkconfig = File.basename($0)