diff --git a/ChangeLog b/ChangeLog
index c4cc5e45d2..1b47a439cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 14 00:41:09 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* thread.c (thread_fd_close_i): IOError exception should be assigned
+	  to rb_thread_t::thrown_errinfo.
+
 Wed Apr 13 20:12:26 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* io.c (rb_io_fdatasync): remove unused variable.
diff --git a/thread.c b/thread.c
index 54664a5503..f787bf1499 100644
--- a/thread.c
+++ b/thread.c
@@ -1465,7 +1465,7 @@ thread_fd_close_i(st_data_t key, st_data_t val, st_data_t data)
     if (THREAD_IO_WAITING_P(th)) {
 	native_mutex_lock(&th->interrupt_lock);
 	if (THREAD_IO_WAITING_P(th) && th->waiting_fd == fd) {
-	    th->errinfo = th->vm->special_exceptions[ruby_error_closed_stream];
+	    th->thrown_errinfo = th->vm->special_exceptions[ruby_error_closed_stream];
 	    RUBY_VM_SET_INTERRUPT(th);
 	    (th->unblock.func)(th->unblock.arg);
 	}