diff --git a/ChangeLog b/ChangeLog
index a3d676b4fb..27792d167a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 28 15:32:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
+	  mswin/mingw.
+
 Thu Apr 28 06:07:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/csv.rb (CSV::open): suppress universal newline decorator.
diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index 3b22ce5b57..4ba0cca6f9 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -25,7 +25,7 @@ when /linux/
   libm_so = File.join(libdir, "libm.so.6")
 when /mingw/, /mswin/
   require "rbconfig"
-  libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/, 2)[0] + ".dll"
+  libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/).find{|e| /^msvc/ =~ e} + ".dll"
 when /darwin/
   libc_so = "/usr/lib/libc.dylib"
   libm_so = "/usr/lib/libm.dylib"