diff --git a/ChangeLog b/ChangeLog
index 1bef620f26..c7b78432ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 25 13:44:51 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* thread.c (rb_thread_wait_fd_rw): should check EBADF on select().
+
 Tue Dec 25 13:30:03 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* thread_pthread.c, thread_pthread.h, thread_win32.c,
diff --git a/thread.c b/thread.c
index 5bf5299221..1a1d3661c3 100644
--- a/thread.c
+++ b/thread.c
@@ -1850,7 +1850,7 @@ rb_thread_wait_fd_rw(int fd, int read)
 
 	rb_fd_term(&set);
 
-	if (result < 0 && errno != EBADF) {
+	if (result < 0) {
 	    rb_sys_fail(0);
 	}
     }