diff --git a/ChangeLog b/ChangeLog
index 138f1e0fe1..7ed8651dae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 22 02:15:40 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): handle EMSGSIZE as
+	  well.
+
 Sun Feb 22 02:03:46 2009  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/ancdata.c (bsock_recvmsg_internal): check max length
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index e3f56fe50f..674923e3ee 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1298,8 +1298,13 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
         if (nonblock && errno == EWOULDBLOCK)
             rb_sys_fail("recvmsg(2) WANT_READ");
 #if defined(HAVE_ST_MSG_CONTROL)
-        if (errno == EMFILE && !gc_done) {
-          /* SCM_RIGHTS hit the file descriptors limit, maybe. */
+        if (!gc_done && (errno == EMFILE || errno == EMSGSIZE)) {
+          /*
+           * When SCM_RIGHTS hit the file descriptors limit:
+           * - Linux 2.6.18 causes success with MSG_CTRUNC
+           * - MacOS X 10.4 causes EMSGSIZE (and lost file descriptors?)
+           * - Solaris 11 causes EMFILE
+           */
           gc_and_retry:
             rb_gc();
             gc_done = 1;