diff --git a/src/appserver.c b/src/appserver.c
index 8a778b3..82b0a7d 100644
--- a/src/appserver.c
+++ b/src/appserver.c
@@ -560,7 +560,7 @@ static int _new_server(AppServer * appserver, char const * app, int options)
 			: INADDR_LOOPBACK);
 	if(bind(fd, (struct sockaddr *)&sa, sizeof(sa)) == 0)
 	{
-		if(listen(fd, 5) == 0)
+		if(listen(fd, SOMAXCONN) == 0)
 		{
 			event_register_io_read(appserver->event, fd,
 					(EventIOFunc)_appserver_accept,
diff --git a/src/transport/tcp.c b/src/transport/tcp.c
index 26e4064..761433c 100644
--- a/src/transport/tcp.c
+++ b/src/transport/tcp.c
@@ -261,7 +261,7 @@ static int _init_server(TCP * tcp, char const * name)
 #ifdef DEBUG
 	fprintf(stderr, "DEBUG: %s() %s\n", __func__, "listen()");
 #endif
-	if(listen(tcp->u.server.fd, 5) != 0)
+	if(listen(tcp->u.server.fd, SOMAXCONN) != 0)
 		return -_tcp_error("listen", 1);
 	event_register_io_read(tcp->helper->event, tcp->u.server.fd,
 			(EventIOFunc)_tcp_callback_accept, tcp);