diff --git a/ChangeLog b/ChangeLog
index d3785801c6..500cfb3759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 24 07:56:54 2015  Eric Wong  <e@80x24.org>
+
+	* ext/socket/init.c (rsock_accept): handle ENOMEM
+
 Tue Nov 24 07:50:15 2015  Eric Wong  <e@80x24.org>
 
 	* dir.c (dir_initialize): use rb_gc_for_fd for ENOMEM
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 3fb436614e..d0711025a5 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -605,6 +605,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 	switch (errno) {
 	  case EMFILE:
 	  case ENFILE:
+	  case ENOMEM:
 	    if (retry) break;
 	    rb_gc();
 	    retry = 1;