diff --git a/core/net/uip-nd6.h b/core/net/uip-nd6.h
index c62e0363e..265c4f3db 100644
--- a/core/net/uip-nd6.h
+++ b/core/net/uip-nd6.h
@@ -98,17 +98,25 @@
 
 /** \name RFC 4861 Node constant */
 #define UIP_ND6_MAX_MULTICAST_SOLICIT  3
+
+#ifdef UIP_CONF_ND6_MAX_UNICAST_SOLICIT
+#define UIP_ND6_MAX_UNICAST_SOLICIT    UIP_CONF_ND6_MAX_UNICAST_SOLICIT
+#else /* UIP_CONF_ND6_MAX_UNICAST_SOLICIT */
 #define UIP_ND6_MAX_UNICAST_SOLICIT    3
+#endif /* UIP_CONF_ND6_MAX_UNICAST_SOLICIT */
+
 #ifdef UIP_CONF_ND6_REACHABLE_TIME
 #define UIP_ND6_REACHABLE_TIME         UIP_CONF_ND6_REACHABLE_TIME
 #else
 #define UIP_ND6_REACHABLE_TIME         30000
 #endif
+
 #ifdef UIP_CONF_ND6_RETRANS_TIMER
 #define UIP_ND6_RETRANS_TIMER	       UIP_CONF_ND6_RETRANS_TIMER
 #else
 #define UIP_ND6_RETRANS_TIMER	       1000
 #endif
+
 #define UIP_ND6_DELAY_FIRST_PROBE_TIME 5
 #define UIP_ND6_MIN_RANDOM_FACTOR(x)   (x / 2)
 #define UIP_ND6_MAX_RANDOM_FACTOR(x)   ((x) + (x) / 2)