diff --git a/ChangeLog b/ChangeLog
index 1dedb7e019..872fb12247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 22 19:28:08 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/init.c (s_recvfrom): use rb_io_wait_readable after
+	  recvfrom.
+
 Sun Feb 22 18:40:04 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/option.c (inspect_errno): new function.
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 908268c40c..8958db7562 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -119,6 +119,9 @@ s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
     while (rb_io_check_closed(fptr),
 	   rb_thread_wait_fd(arg.fd),
 	   (slen = BLOCKING_REGION(recvfrom_blocking, &arg)) < 0) {
+        if (!rb_io_wait_readable(fptr->fd)) {
+            rb_sys_fail("recvfrom(2)");
+        }
 	if (RBASIC(str)->klass || RSTRING_LEN(str) != buflen) {
 	    rb_raise(rb_eRuntimeError, "buffer string modified");
 	}