diff --git a/configs/README.txt b/configs/README.txt
index cc8643068e0..da9535e8ab5 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -213,11 +213,14 @@ defconfig -- This is a configuration file similar to the Linux
 		CONFIG_NET_IPv6 - Build in support for IPv6
 		CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors
                   per task/thread.
-		CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+		CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 		CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 		CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
 
-		CONFIG_NET_BUFFER_SIZE - uIP buffer size
+		CONFIG_NET_BUFSIZE - uIP buffer size
+		CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+		CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers
+		  (may be zero)
 		CONFIG_NET_UDP - UDP support on or off
 		CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 		CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP
diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig
index db582e93bcd..2bc085041f0 100644
--- a/configs/c5471evm/defconfig
+++ b/configs/c5471evm/defconfig
@@ -254,10 +254,12 @@ CONFIG_PREALLOC_TIMERS=8
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -271,10 +273,10 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_NET=n
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=n
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 700bcbb0f87..b07ac62a049 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -243,10 +243,12 @@ CONFIG_PREALLOC_TIMERS=8
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -260,10 +262,10 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_NET=n
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=n
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/mcu123-lpc214x/defconfig b/configs/mcu123-lpc214x/defconfig
index aa6352420db..fe6a9380135 100644
--- a/configs/mcu123-lpc214x/defconfig
+++ b/configs/mcu123-lpc214x/defconfig
@@ -267,10 +267,12 @@ CONFIG_PREALLOC_TIMERS=8
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -284,10 +286,10 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_NET=n
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=n
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/ntosd-dm320/defconfig b/configs/ntosd-dm320/defconfig
index b3576fd5ac8..d7ae85b3b35 100644
--- a/configs/ntosd-dm320/defconfig
+++ b/configs/ntosd-dm320/defconfig
@@ -252,10 +252,12 @@ CONFIG_PREALLOC_TIMERS=8
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -269,10 +271,10 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_NET=n
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=n
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/ntosd-dm320/netconfig b/configs/ntosd-dm320/netconfig
index 050196ee5a7..042a4907702 100644
--- a/configs/ntosd-dm320/netconfig
+++ b/configs/ntosd-dm320/netconfig
@@ -253,10 +253,12 @@ CONFIG_PREALLOC_TIMERS=8
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -270,10 +272,10 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_NET=y
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=8
-CONFIG_NET_MAX_CONNECTIONS=8
+CONFIG_NET_TCP_CONNS=8
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 61ad5c12cc6..d3abb4e9d53 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -240,10 +240,12 @@ CONFIG_PREALLOC_TIMERS=0
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -257,10 +259,10 @@ CONFIG_PREALLOC_TIMERS=0
 CONFIG_NET=n
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=n
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/sim/defconfig b/configs/sim/defconfig
index 2d959fbcf3f..45b338948f1 100644
--- a/configs/sim/defconfig
+++ b/configs/sim/defconfig
@@ -214,10 +214,12 @@ CONFIG_FS_FAT=y
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -231,10 +233,10 @@ CONFIG_FS_FAT=y
 CONFIG_NET=n
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=n
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10
diff --git a/configs/sim/netconfig b/configs/sim/netconfig
index 2cdea0a6133..781a4d8c091 100644
--- a/configs/sim/netconfig
+++ b/configs/sim/netconfig
@@ -215,10 +215,12 @@ CONFIG_FS_FAT=y
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
 # CONFIG_NSOCKET_DESCRIPTORS - Maximum number of socket descriptors per task/thread.
-# CONFIG_NET_MAX_CONNECTIONS - Maximum number of TCP connections (all tasks)
+# CONFIG_NET_TCP_CONNS - Maximum number of TCP connections (all tasks)
 # CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports (all tasks)
 # CONFIG_NET_SOCKOPTS - Enable or disable support for socket options
-# CONFIG_NET_BUFFER_SIZE - uIP buffer size
+# CONFIG_NET_BUFSIZE - uIP buffer size
+# CONFIG_NET_TCP_READAHEAD_BUFSIZE - Size of TCP read-ahead buffers
+# CONFIG_NET_NTCP_READAHEAD_BUFFERS - Number of TCP read-ahead buffers (may be zero)
 # CONFIG_NET_UDP - UDP support on or off
 # CONFIG_NET_UDP_CHECKSUMS - UDP checksums on or off
 # CONFIG_NET_UDP_CONNS - The maximum amount of concurrent UDP connections
@@ -232,10 +234,10 @@ CONFIG_FS_FAT=y
 CONFIG_NET=y
 CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=8
-CONFIG_NET_MAX_CONNECTIONS=40
+CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFFER_SIZE=420
+CONFIG_NET_BUFSIZE=420
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 #CONFIG_NET_UDP_CONNS=10