diff --git a/configs/Kconfig b/configs/Kconfig
index c4565dbe7d..b5869e2095 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -870,6 +870,7 @@ config ARCH_BOARD_CUSTOM_DIR
 		"~/projects/myboard").
 
 config ARCH_BOARD
+	string
 	default "amber"               if ARCH_BOARD_AMBER
 	default "arduino-due"         if ARCH_BOARD_ARDUINO_DUE
 	default "avr32dev1"           if ARCH_BOARD_AVR32DEV1
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index a6675ebb00..a0a9dd2004 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -551,8 +551,9 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP_READAHEAD=y
-CONFIG_NET_TCP_READAHEAD_BUFSIZE=650
+CONFIG_NET_TCP_READAHEAD_BUFSIZE=596
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=8
+# CONFIG_NET_TCP_WRITE_BUFFERS is not set
 CONFIG_NET_TCP_RECVDELAY=0
 # CONFIG_NET_TCPBACKLOG is not set
 # CONFIG_NET_TCP_SPLIT is not set
@@ -571,7 +572,7 @@ CONFIG_NET_ICMP_PING=y
 # CONFIG_NET_PINGADDRCONF is not set
 # CONFIG_NET_IGMP is not set
 # CONFIG_NET_STATISTICS is not set
-CONFIG_NET_RECEIVE_WINDOW=650
+CONFIG_NET_RECEIVE_WINDOW=596
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ROUTE is not set
@@ -886,7 +887,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
-# System NSH Add-Ons
+# System Libraries and NSH Add-Ons
 #
 
 #
@@ -906,6 +907,11 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # I2C tool
 #
 
+#
+# INI File Parser
+#
+# CONFIG_SYSTEM_INIFILE is not set
+
 #
 # FLASH Program Installation
 #
diff --git a/include/nuttx/net/uip/uipopt.h b/include/nuttx/net/uip/uipopt.h
index 457a2f855a..5059d7e1b9 100644
--- a/include/nuttx/net/uip/uipopt.h
+++ b/include/nuttx/net/uip/uipopt.h
@@ -316,6 +316,12 @@
 
 #  ifndef CONFIG_NET_TCP_WRITE_BUFSIZE
 #    define CONFIG_NET_TCP_WRITE_BUFSIZE UIP_TCP_MSS
+#  endif
+
+  /* The size of the write buffer should not exceed the maximum TCP MSS */
+
+#  if CONFIG_NET_TCP_WRITE_BUFSIZE > UIP_TCP_MSS
+#    error CONFIG_NET_TCP_WRITE_BUFSIZE must not exceed UIP_TCP_MSS
 #  endif
 
 #else
diff --git a/net/Kconfig b/net/Kconfig
index 1bf7914134..ead407e5ed 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -50,6 +50,7 @@ config NET_PROMISCUOUS
 config NET_IPv6
 	bool "IPv6"
 	default n
+	depends on EXPERIMENTAL
 	---help---
 		Build in support for IPv6.  Not fully implemented.
 
@@ -83,7 +84,7 @@ config NET_SOLINGER
 endif # NET_SOCKOPTS
 
 config NET_BUFSIZE
-	int "Network packet size"
+	int "Network packet buffer size"
 	default 1294 if !NET_SLIP && NET_IPv6
 	default 590 if !NET_SLIP && !NET_IPv6
 	default 296 if NET_SLIP && !NET_IPv6