diff --git a/ChangeLog b/ChangeLog
index a8120d2af5..104a4677bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  4 12:46:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): Added POLLNVAL check.
+	  based on a patch from Eric Wong at [ruby-core:35991].
+
 Wed May  4 11:51:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* io.c (rb_f_select): remove useless ifdef.
diff --git a/thread.c b/thread.c
index 6246243706..5e10a8366f 100644
--- a/thread.c
+++ b/thread.c
@@ -2737,7 +2737,10 @@ retry:
     }, ubf_select, GET_THREAD());
 
     if (result > 0) {
-	/* remain compatible with select(2)-based implementation */
+	if (fds.revents & POLLNVAL) {
+	    errno = EBADF;
+	    return -1;
+	}
 	result = (int)(fds.revents & fds.events);
 	return result == 0 ? events : result;
     }