diff --git a/examples/ipv6/rpl-udp/Makefile b/examples/ipv6/rpl-udp/Makefile
index e23e4179e..d6e4e431b 100644
--- a/examples/ipv6/rpl-udp/Makefile
+++ b/examples/ipv6/rpl-udp/Makefile
@@ -1,8 +1,6 @@
 all: udp-client udp-server
 
-CONTIKI=../../../../contiki-2.x
-
-TARGET=sky
+CONTIKI=../../..
 
 WITH_UIP6=1
 UIP_CONF_IPV6=1
diff --git a/examples/ipv6/rpl-udp/Makefile.target b/examples/ipv6/rpl-udp/Makefile.target
new file mode 100644
index 000000000..d56a50bcc
--- /dev/null
+++ b/examples/ipv6/rpl-udp/Makefile.target
@@ -0,0 +1 @@
+TARGET = sky
diff --git a/examples/ipv6/rpl-udp/udp-client.c b/examples/ipv6/rpl-udp/udp-client.c
index f8090db21..d1ae09889 100644
--- a/examples/ipv6/rpl-udp/udp-client.c
+++ b/examples/ipv6/rpl-udp/udp-client.c
@@ -33,7 +33,6 @@
 #include "net/uip.h"
 #include "net/uip-ds6.h"
 #include "net/uip-udp-packet.h"
-#include "node-id.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/examples/ipv6/rpl-udp/udp-server.c b/examples/ipv6/rpl-udp/udp-server.c
index 6a4f1debb..d5a863acb 100644
--- a/examples/ipv6/rpl-udp/udp-server.c
+++ b/examples/ipv6/rpl-udp/udp-server.c
@@ -32,7 +32,6 @@
 #include "contiki-net.h"
 #include "net/uip.h"
 #include "net/rpl/rpl.h"
-#include "node-id.h"
 
 #include "net/netstack.h"
 #include "dev/button-sensor.h"