diff --git a/ChangeLog b/ChangeLog
index 08184fa36c..e1ddbb6152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 09 12:28:18 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/mkmf.rb (init_mkmf): add libdir to LIBPATH unless cross
+	  compiling.
+
 Sun Feb  9 08:34:45 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index df518c193d..4ae477ff48 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -797,12 +797,12 @@ def init_mkmf(config = CONFIG)
   $LIBRUBYARG = ""
   $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
   $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
-  $LIBPATH = $extmk ? ["$(topdir)"] : []
+  $LIBPATH = CROSS_COMPILING ? [] : ["$(libdir)"]
+  $LIBPATH.unshift("$(topdir)") if $extmk
 
   $objs = nil
   $libs = ""
   if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup)
-    $LIBPATH.unshift("$(libdir)") unless $extmk or CROSS_COMPILING
     $LIBRUBYARG = config['LIBRUBYARG']
   end