diff --git a/configs/README.txt b/configs/README.txt
index ffba4622791..a3ea2ec3ea8 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -212,8 +212,10 @@ defconfig -- This is a configuration file similar to the Linux
 		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
-		CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+		CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 		CONFIG_NET_UDP - UDP support on or off
diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig
index cad40482131..c1490584822 100644
--- a/configs/c5471evm/defconfig
+++ b/configs/c5471evm/defconfig
@@ -254,8 +254,9 @@ 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
-# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 # CONFIG_NET_UDP - UDP support on or off
@@ -274,6 +275,7 @@ CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
 CONFIG_NET_MAX_CONNECTIONS=40
 CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFFER_SIZE=420
 CONFIG_NET_LOGGING=y
 CONFIG_NET_UDP=n
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 15ba43500fb..0279e73bec6 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -243,8 +243,9 @@ 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
-# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 # CONFIG_NET_UDP - UDP support on or off
@@ -263,6 +264,7 @@ CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
 CONFIG_NET_MAX_CONNECTIONS=40
 CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFFER_SIZE=420
 CONFIG_NET_LOGGING=y
 CONFIG_NET_UDP=n
diff --git a/configs/mcu123-lpc214x/defconfig b/configs/mcu123-lpc214x/defconfig
index f8874256a3a..e594174f79b 100644
--- a/configs/mcu123-lpc214x/defconfig
+++ b/configs/mcu123-lpc214x/defconfig
@@ -267,8 +267,9 @@ 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
-# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 # CONFIG_NET_UDP - UDP support on or off
@@ -287,6 +288,7 @@ CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
 CONFIG_NET_MAX_CONNECTIONS=40
 CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFFER_SIZE=420
 CONFIG_NET_LOGGING=y
 CONFIG_NET_UDP=n
diff --git a/configs/ntosd-dm320/defconfig b/configs/ntosd-dm320/defconfig
index 7e1d182f132..36a3b8f46bb 100644
--- a/configs/ntosd-dm320/defconfig
+++ b/configs/ntosd-dm320/defconfig
@@ -252,8 +252,9 @@ 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
-# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 # CONFIG_NET_UDP - UDP support on or off
@@ -272,6 +273,7 @@ CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
 CONFIG_NET_MAX_CONNECTIONS=40
 CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFFER_SIZE=420
 CONFIG_NET_LOGGING=y
 CONFIG_NET_UDP=n
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 1af793bd483..513ce74e079 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -240,8 +240,9 @@ 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
-# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 # CONFIG_NET_UDP - UDP support on or off
@@ -260,6 +261,7 @@ CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
 CONFIG_NET_MAX_CONNECTIONS=40
 CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFFER_SIZE=420
 CONFIG_NET_LOGGING=y
 CONFIG_NET_UDP=n
diff --git a/configs/sim/defconfig b/configs/sim/defconfig
index 3d363786f8c..fb5f60a1a85 100644
--- a/configs/sim/defconfig
+++ b/configs/sim/defconfig
@@ -214,8 +214,9 @@ 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
-# CONFIG_NET_MAX_LISTENPORTS - Maximum number of listening TCP ports
+# CONFIG_NET_MAX_CONNECTIONS - 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_LOGGING - Logging on or off
 # CONFIG_NET_UDP - UDP support on or off
@@ -234,6 +235,7 @@ CONFIG_NET_IPv6=n
 CONFIG_NSOCKET_DESCRIPTORS=0
 CONFIG_NET_MAX_CONNECTIONS=40
 CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFFER_SIZE=420
 CONFIG_NET_LOGGING=y
 CONFIG_NET_UDP=n