diff --git a/ChangeLog b/ChangeLog
index 52ad98ad7c..10656e709f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep  8 06:50:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XLDFLAGS): added --enable-auto-import for cygwin and
+	  mingw.
+
 Mon Sep  8 02:04:25 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/encoding.h (rb_econv_set_replacement): renamed from
@@ -410,7 +415,7 @@ Thu Sep  4 23:18:55 2008  Tanaka Akira  <akr@fsij.org>
 
 Thu Sep  4 23:05:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
-	* lib/prime.rb (Prime::OldCompatibility#each): added compatibility to 
+	* lib/prime.rb (Prime::OldCompatibility#each): added compatibility to
 	    Ruby 1.8.7.
 	  (Prime#each): added more rdocs.
 	  (Prime#each): remembers the last value of the given block.
@@ -1378,7 +1383,7 @@ Sat Aug 30 15:43:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/openssl/ossl_config.c (Init_ossl_config): memory leak fixed.
 	  a patch <shinichiro.hamaji at gmail.com> in [ruby-dev:35880].
- 
+
 	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
 
 	* ext/strscan/strscan.c (strscan_do_scan): ditto.
diff --git a/configure.in b/configure.in
index 3e1130d050..327abb24eb 100644
--- a/configure.in
+++ b/configure.in
@@ -1407,10 +1407,12 @@ if test "$with_dln_a_out" != yes; then
 			LDSHARED="$LDSHARED ${linker_flag}-G"
 			DLDFLAGS='-eInit_$(TARGET)'
 			XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl"
+			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
 			: ${ARCHFILE="ruby.imp"}
                         TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
                         TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
 			: ${LIBPATHENV=SHLIB_PATH}
+			RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s"
 			rb_cv_dlopen=yes ;;
 	human*)		: ${DLDFLAGS=''}
 			: ${LDSHARED=''}
@@ -1446,7 +1448,7 @@ if test "$with_dln_a_out" != yes; then
 			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
 			rb_cv_dlopen=yes;;
 	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
-			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000"
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
 			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
 			: ${LIBPATHENV=""}
 			rb_cv_dlopen=yes ;;