diff --git a/net/ip/Kconfig b/net/ip/Kconfig
index 4839a7ac821..2a63f89bffd 100644
--- a/net/ip/Kconfig
+++ b/net/ip/Kconfig
@@ -127,6 +127,15 @@ config	NETWORKING_IPV6_NO_ND
 	  Normally ND should be enabled but in order to simplify
 	  the network setup it can be turned off if using
 	  slip and tun device.
+
+config	NETWORKING_MAX_NEIGHBORS
+	int "Max number of neighbors"
+	depends on NETWORKING
+	depends on NETWORKING_WITH_IPV6
+	default 4
+	help
+	  Specifies the maximum number of neighbors that each node will
+	  be able to handle.
 endif
 
 config	NETWORKING_WITH_TCP
diff --git a/net/ip/contiki/contiki-conf.h b/net/ip/contiki/contiki-conf.h
index 30cc03101ac..6fc5ac63872 100644
--- a/net/ip/contiki/contiki-conf.h
+++ b/net/ip/contiki/contiki-conf.h
@@ -247,4 +247,8 @@ typedef unsigned int uip_stats_t;
 #define UIP_CONF_MAX_CONNECTIONS CONFIG_TCP_MAX_CONNECTIONS
 #endif
 
+#if defined(CONFIG_NETWORKING_MAX_NEIGHBORS)
+#define NBR_TABLE_CONF_MAX_NEIGHBORS CONFIG_NETWORKING_MAX_NEIGHBORS
+#endif
+
 #endif /* __CONTIKI_CONF_H__ */