diff --git a/net/ip/Kconfig b/net/ip/Kconfig
index 758ef620d80..4839a7ac821 100644
--- a/net/ip/Kconfig
+++ b/net/ip/Kconfig
@@ -137,6 +137,15 @@ config	NETWORKING_WITH_TCP
 	help
 	  Enable Transmission and Control Protocol (TCP) support.
 
+config	TCP_MAX_CONNECTIONS
+	int "Maximum number of connections"
+	depends on NETWORKING_WITH_TCP
+	default 2
+	help
+	  Tweak the TCP maximum segment size. Normally one should
+	  not change this but let the IP stack to calculate a best
+	  size for it.
+
 config	TCP_DISABLE_ACTIVE_OPEN
 	bool
 	prompt "Disallow host to initiate connection attempt"
diff --git a/net/ip/contiki/contiki-conf.h b/net/ip/contiki/contiki-conf.h
index fdeb2e67771..30cc03101ac 100644
--- a/net/ip/contiki/contiki-conf.h
+++ b/net/ip/contiki/contiki-conf.h
@@ -243,4 +243,8 @@ typedef unsigned int uip_stats_t;
 #define UIP_CONF_UDP_CONNS CONFIG_UDP_MAX_CONNECTIONS
 #endif
 
+#if defined(CONFIG_TCP_MAX_CONNECTIONS)
+#define UIP_CONF_MAX_CONNECTIONS CONFIG_TCP_MAX_CONNECTIONS
+#endif
+
 #endif /* __CONTIKI_CONF_H__ */