diff --git a/ChangeLog b/ChangeLog
index 022686c99f..6f5bb08da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
+
 Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 5cd7f498cc..b0bc9f3c4f 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -480,6 +480,9 @@ Dir.chdir ".."
 unless $destdir.to_s.empty?
   $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
 end
+unless $extlist.empty?
+  rm_f(Config::CONFIG["LIBRUBY_SO"])
+end
 puts "making #{rubies.join(', ')}"
 $stdout.flush
 $mflags.concat(rubies)