diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index 48dffb0d69c..d31b78c0f92 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -634,6 +634,9 @@ CONFIG_NET_BROADCAST=y
 #
 CONFIG_NET_ICMPv6=y
 CONFIG_NET_ICMPv6_PING=y
+CONFIG_NET_ICMPv6_NEIGHBOR=y
+CONFIG_ICMPv6_NEIGHBOR_MAXTRIES=5
+CONFIG_ICMPv6_NEIGHBOR_DELAYMSEC=100
 
 #
 # IGMPv2 Client Support
diff --git a/net/icmpv6/Kconfig b/net/icmpv6/Kconfig
index f361c75b049..d1a30df562c 100644
--- a/net/icmpv6/Kconfig
+++ b/net/icmpv6/Kconfig
@@ -26,7 +26,6 @@ config NET_ICMPv6_PING
 config NET_ICMPv6_NEIGHBOR
 	bool "Solicit destination addresses"
 	default n
-	depends on EXPERIMENTAL
 	---help---
 		Enable logic to send ICMPv6 neighbor solicitation requests if
 		the target IPv6 address mapping does not appear in the Neighbor
@@ -43,7 +42,7 @@ config ICMPv6_NEIGHBOR_MAXTRIES
 
 config ICMPv6_NEIGHBOR_DELAYMSEC
 	int "ICMPv6 re-solicit delay"
-	default 20
+	default 100
 	---help---
 		Wait this number of milliseconds after sending the Neighbor
 		Solicitation before checking if the IPv6 address mapping is present