diff --git a/Config b/Config
index de1e9232e..8f67360fe 100755
--- a/Config
+++ b/Config
@@ -707,7 +707,7 @@ while [ -z "$TEST" ] ; do
 	echo "What is the maximum number of sockets (and file descriptors) that"
 	echo "UnrealIRCd may use?"
 	echo "It is recommended to leave this at the default setting 'auto',"
-	echo "which at present results in a limit of up to 8192, depending on"
+	echo "which at present results in a limit of up to 16384, depending on"
 	echo "the system. When you boot UnrealIRCd later you will always see"
 	echo "the effective limit."
 	echo $n "[$TEST] -> $c"
diff --git a/include/config.h b/include/config.h
index 0d9330188..e891c4dc2 100644
--- a/include/config.h
+++ b/include/config.h
@@ -162,11 +162,11 @@
       (defined(HAVE_POLL) || defined(HAVE_EPOLL) || defined(HAVE_KQUEUE))
   /* Have poll/epoll/kqueue and either no --with-maxconnections or
    * --with-maxconnections=0, either of which indicates 'automatic' mode.
-   * At the time of writing we will try a limit of 8192.
+   * At the time of writing we will try a limit of 16384.
    * It will automatically be lowered at boottime if we can only use
    * 4096, 2048 or 1024. No problem.
    */
-  #define MAXCONNECTIONS 8192
+  #define MAXCONNECTIONS 16384
  #elif defined(MAXCONNECTIONS_REQUEST) && (MAXCONNECTIONS_REQUEST >= 1)
   /* --with-maxconnections=something */
   #define MAXCONNECTIONS MAXCONNECTIONS_REQUEST