diff --git a/ChangeLog b/ChangeLog
index 4202d1d8ae..5694d4c971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  6 14:12:39 2010  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: test RUBY_PLATFORM for loading tmpdir.so to avoid
+	  LoadError.
+
 Thu May  6 12:41:00 2010  Kenta Murata  <mrkn@mrkn.jp>
 
 	* NEWS: add rationalize methods of Complex, Float, Integer, NilClass,
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 302c2fb39f..2f9a2486b0 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -5,9 +5,8 @@
 #
 
 require 'fileutils'
-begin
+if /mswin|mingw/ =~ RUBY_PLATFORM
   require 'tmpdir.so'
-rescue LoadError
 end
 
 class Dir