diff --git a/ChangeLog b/ChangeLog
index 92b01f9e6a..40e7c95c8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 18 17:41:00 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): link archives only, skip script only
+	  extension libraries.
+
 Fri May 18 17:25:33 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* cont.c: bump up fiber machine stack size when running on 64bit
diff --git a/ext/extmk.rb b/ext/extmk.rb
index a498268114..45c0afd423 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -234,7 +234,7 @@ def extmake(target)
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
       args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
     end
-    if $static and %r(\A-test-) !~ target and ok
+    if $static and ok and !$objs.empty? and !File.fnmatch?("-*", target)
       args += ["static"] unless $clean
       $extlist.push [$static, target, $target, $preload]
     end