diff --git a/examples/udp-receiver-ipv6/example-udp-receiver.c b/examples/udp-receiver-ipv6/example-udp-receiver.c
index 0ad8015a7..a3a5d1c47 100644
--- a/examples/udp-receiver-ipv6/example-udp-receiver.c
+++ b/examples/udp-receiver-ipv6/example-udp-receiver.c
@@ -72,12 +72,18 @@ udphandler(process_event_t ev, process_data_t data)
 PROCESS_THREAD(udp_process_receiver, ev, data)
 {
   uip_ipaddr_t ipaddr;
+  int a;
 
   PROCESS_BEGIN();
   PRINTF("Process test UDP receiver started\n");
 
-  PRINTF("Local IPv6 address: ");
-  PRINT6ADDR(&uip_netif_physical_if.addresses[0].ipaddr);
+  PRINTF("Tentative link-local IPv6 address: ");
+  for(a = 0; a < UIP_DS6_ADDR_NB; a++) {
+    if(uip_ds6_if.addr_list[a].isused) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[a].ipaddr);
+      PRINTF("\n");
+    }
+  }
   PRINTF("\n");
 
 #ifdef UDP_ADDR_A
diff --git a/examples/udp-sender-ipv6/example-udp-sender.c b/examples/udp-sender-ipv6/example-udp-sender.c
index 74ead768b..a2d42d6f4 100644
--- a/examples/udp-sender-ipv6/example-udp-sender.c
+++ b/examples/udp-sender-ipv6/example-udp-sender.c
@@ -30,7 +30,6 @@
 #include "contiki.h"
 #include "contiki-lib.h"
 #include "contiki-net.h"
-#include "net/uip-netif.h"
 
 #include <string.h>
 
@@ -92,12 +91,18 @@ udphandler(process_event_t ev, process_data_t data)
 PROCESS_THREAD(udp_process_sender, ev, data)
 {
   uip_ipaddr_t ipaddr;
+  int a;
 
   PROCESS_BEGIN();
   PRINTF("Process test UDP sender started\n");
 
-  PRINTF("Local IPv6 address: ");
-  PRINT6ADDR(&uip_netif_physical_if.addresses[0].ipaddr);
+  PRINTF("Tentative link-local IPv6 address: ");
+  for(a = 0; a < UIP_DS6_ADDR_NB; a++) {
+    if(uip_ds6_if.addr_list[a].isused) {
+      PRINT6ADDR(&uip_ds6_if.addr_list[a].ipaddr);
+      PRINTF("\n");
+    }
+  }
   PRINTF("\n");
 
 #ifdef UDP_ADDR_A