diff --git a/ChangeLog b/ChangeLog
index 6d6aaef83d..1125ca4e3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 30 00:59:16 2001  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
+	  unconditionally on mswin32/mingw32.
+
 Fri Dec 28 14:39:05 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* array.c (rb_cmpint): fixed typo.
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 0652ac2e0b..86dd67e558 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -196,6 +196,7 @@ def have_library(lib, func="main")
   if func && func != ""
     libs = append_library($libs, lib)
     if /mswin32|mingw/ =~ RUBY_PLATFORM
+      return true if lib == 'm'
       r = try_link(<<"SRC", libs)
 #include <windows.h>
 #include <winsock.h>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index fb6253b3f5..9972fbdb1e 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -182,6 +182,7 @@ def have_library(lib, func="main")
   if func && func != ""
     libs = append_library($libs, lib)
     if /mswin32|mingw/ =~ RUBY_PLATFORM
+      return true if lib == 'm'
       r = try_link(<<"SRC", libs)
 #include <windows.h>
 #include <winsock.h>