diff --git a/cherokee/macros.h b/cherokee/macros.h
index 629a2016b..c892e8974 100644
--- a/cherokee/macros.h
+++ b/cherokee/macros.h
@@ -108,10 +108,11 @@
 #define NONCE_CLEANUP_LAPSE           60
 #define NONCE_EXPIRATION              60
 
-#define FD_NUM_SPARE                  10	/* range:  8 - 20 */
-#define FD_NUM_MIN_SYSTEM             20	/* range: 16 - 64 */
-#define FD_NUM_MIN_AVAILABLE           8	/* range:  8 ... 65000 */
-#define FD_NUM_MIN_PER_THREAD          8	/* range:  8 ... 65000 */
+#define FD_NUM_SPARE                  10        /* range:  8 ... 20    */
+#define FD_NUM_MIN_SYSTEM             20        /* range: 16 ... 64    */
+#define FD_NUM_MIN_AVAILABLE          8         /* range:  8 ... 65000 */
+#define FD_NUM_MIN_PER_THREAD         8         /* range:  8 ... 65000 */
+#define FD_NUM_CUSTOM_LIMIT           4096      /* range: 16 ... 65000 */
 
 #define EXIT_OK                        0
 #define EXIT_ERROR                     1
diff --git a/cherokee/server.c b/cherokee/server.c
index 7ad1fd868..98fa0cef1 100644
--- a/cherokee/server.c
+++ b/cherokee/server.c
@@ -133,7 +133,7 @@ cherokee_server_new  (cherokee_server_t **srv)
 	n->group_orig       = getgid();
 	n->group            = n->group_orig;
 
-	n->fdlimit_custom    = -1;
+	n->fdlimit_custom    = FD_NUM_CUSTOM_LIMIT;
 	n->fdlimit_available = -1;
 
 	n->conns_max        =  0;