diff --git a/ChangeLog b/ChangeLog
index d836f9d008..f90497560f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Fri May  8 19:17:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May  8 19:38:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_link0): removes waste dSYM directories lef
+	  when debug and universal-binary are enabled.
 
 	* lib/mkmf.rb (check_sizeof): fixed wrong recuring result for
 	  intrinsic types.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 45346bfdbc..73866e229f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -413,7 +413,20 @@ def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
 end
 
 def try_link0(src, opt="", &b)
-  try_do(src, link_command("", opt), &b)
+  cmd = link_command("", opt)
+  if $universal
+    require 'tmpdir'
+    Dir.mktmpdir("mkmf_", oldtmpdir = ENV["TMPDIR"]) do |tmpdir|
+      begin
+        ENV["TMPDIR"] = tmpdir
+        try_do(src, cmd, &b)
+      ensure
+        ENV["TMPDIR"] = oldtmpdir
+      end
+    end
+  else
+    try_do(src, cmd, &b)
+  end
 end
 
 def try_link(src, opt="", &b)