diff --git a/core/net/uip-ds6.c b/core/net/uip-ds6.c
index 396f69814..e96f4f5fa 100755
--- a/core/net/uip-ds6.c
+++ b/core/net/uip-ds6.c
@@ -63,8 +63,10 @@ struct etimer uip_ds6_timer_periodic;                           /** \brief Timer
 
 #if UIP_CONF_ROUTER
 struct stimer uip_ds6_timer_ra;                                 /** \brief RA timer, to schedule RA sending */
+#if UIP_ND6_SEND_RA
 static uint8_t racount;                                         /** \brief number of RA already sent */
 static uint16_t rand_time;                                      /** \brief random time value for timers */
+#endif
 #else /* UIP_CONF_ROUTER */
 struct etimer uip_ds6_timer_rs;                                 /** \brief RS timer, to schedule RS sending */
 static uint8_t rscount;                                         /** \brief number of rs already sent */
diff --git a/core/net/uip-nd6.h b/core/net/uip-nd6.h
index c61b90e30..6de9c7b2e 100644
--- a/core/net/uip-nd6.h
+++ b/core/net/uip-nd6.h
@@ -85,7 +85,11 @@
 
 /** \name RFC 4861 Router constants */
 /** @{ */
+#ifndef UIP_CONF_ND6_SEND_RA
 #define UIP_ND6_SEND_RA                     1   /* enable/disable RA sending */
+#else
+#define UIP_ND6_SEND_RA UIP_CONF_ND6_SEND_RA
+#endif
 #define UIP_ND6_MAX_RA_INTERVAL             600
 #define UIP_ND6_MIN_RA_INTERVAL             (UIP_ND6_MAX_RA_INTERVAL / 3)
 #define UIP_ND6_M_FLAG                      0