diff --git a/CHANGES b/CHANGES
index 539a8bb534..a92ee32cd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1245.	[bug]		Treat ENOBUFS, ENOMEM and ENFILE as soft errors for
+			accept().
+
 1244.	[bug]		Receiving a TCP message from a blackhole address would
 			prevent further messages being received over that
 			interface.
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 5ae319e84b..8cc6ffa031 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.223 2002/04/02 04:36:50 marka Exp $ */
+/* $Id: socket.c,v 1.224 2002/04/03 05:41:20 marka Exp $ */
 
 #include <config.h>
 
@@ -1745,6 +1745,9 @@ internal_accept(isc_task_t *me, isc_event_t *ev) {
 		if (SOFT_ERROR(errno))
 			goto soft_error;
 		switch (errno) {
+		case ENOBUFS:
+		case ENFILE:
+		case ENOMEM:
 		case ECONNRESET:
 		case ECONNABORTED:
 		case EHOSTUNREACH: