diff --git a/ChangeLog b/ChangeLog
index dc9a35921350c3..3654044a0650dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 10 18:00:41 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* prelude.rb (Mutex::synchronize): capture exception from unlock.
+	  [ruby-dev:32935]
+
 Thu Jan 10 10:15:03 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (io_encoding_set): IO.pipe("euc-jp", nil) should work as
diff --git a/prelude.rb b/prelude.rb
index 8d6f70657e4c95..a38a5785950e57 100644
--- a/prelude.rb
+++ b/prelude.rb
@@ -7,7 +7,7 @@ def synchronize
     begin
       yield
     ensure
-      self.unlock
+      self.unlock rescue nil
     end
   end
 end