diff --git a/examples/osd/er-rest-example-merkurboard/Makefile b/examples/osd/er-rest-example-merkurboard/Makefile
index 17792e430..60d971598 100644
--- a/examples/osd/er-rest-example-merkurboard/Makefile
+++ b/examples/osd/er-rest-example-merkurboard/Makefile
@@ -6,9 +6,6 @@ all: er-example-server er-example-client
 # configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
 WITH_COAP=13
 
-
-# variable for Makefile.include
-WITH_UIP6=1
 # for some platforms
 UIP_CONF_IPV6=1
 # IPv6 make config disappeared completely
diff --git a/examples/osd/er-rest-example-merkurboard/er-example-client.c b/examples/osd/er-rest-example-merkurboard/er-example-client.c
index 8a0e0d667..14b5a291a 100644
--- a/examples/osd/er-rest-example-merkurboard/er-example-client.c
+++ b/examples/osd/er-rest-example-merkurboard/er-example-client.c
@@ -73,7 +73,7 @@
 #endif
 
 /* TODO: This server address is hard-coded for Cooja. */
-#define SERVER_NODE(ipaddr)   uip_ip6addr(ipaddr, 0xfe80, 0, 0, 0, 0x0221, 0x2eff, 0xff00, 0x270d) /* cooja2 */
+#define SERVER_NODE(ipaddr)   uip_ip6addr(ipaddr, 0xfe80, 0, 0, 0, 0x0221, 0x2eff, 0xff00, 0x26e6) /* cooja2 */
 
 #define LOCAL_PORT      UIP_HTONS(COAP_DEFAULT_PORT+1)
 #define REMOTE_PORT     UIP_HTONS(COAP_DEFAULT_PORT)
diff --git a/examples/osd/er-rest-example-merkurboard/er-example-server.c b/examples/osd/er-rest-example-merkurboard/er-example-server.c
index 14c203b12..48b320f26 100644
--- a/examples/osd/er-rest-example-merkurboard/er-example-server.c
+++ b/examples/osd/er-rest-example-merkurboard/er-example-server.c
@@ -45,7 +45,6 @@
 
 /* Define which resources to include to meet memory constraints. */
 #define REST_RES_INFO 1
-#define REST_RES_DS1820 0
 #define REST_RES_HELLO 0
 #define REST_RES_MIRROR 0 /* causes largest code size */
 #define REST_RES_CHUNKS 1
@@ -790,9 +789,6 @@ hw_init()
 #if defined (PLATFORM_HAS_LEDS)
  leds_off(LEDS_RED);
 #endif
-#if REST_RES_DS1820
-  ds1820_temp();
-#endif
 }
 
 PROCESS(rest_server_example, "Erbium Example Server");
diff --git a/examples/osd/er-rest-example-merkurboard/project-conf.h b/examples/osd/er-rest-example-merkurboard/project-conf.h
index f02a4c5e3..d98699d4c 100644
--- a/examples/osd/er-rest-example-merkurboard/project-conf.h
+++ b/examples/osd/er-rest-example-merkurboard/project-conf.h
@@ -29,8 +29,8 @@
  *
  */
 
-#ifndef __PROJECT_ERBIUM_CONF_H__
-#define __PROJECT_ERBIUM_CONF_H__
+#ifndef PROJECT_ERBIUM_CONF_H_
+#define PROJECT_ERBIUM_CONF_H_
 
 #define PLATFORM_HAS_LEDS    1
 #define PLATFORM_HAS_BUTTON  1
@@ -58,7 +58,7 @@
 /* The IP buffer size must fit all other hops, in particular the border router. */
 
 #undef UIP_CONF_BUFFER_SIZE
-#define UIP_CONF_BUFFER_SIZE    1280
+#define UIP_CONF_BUFFER_SIZE    256
 
 
 /* Multiplies with chunk size, be aware of memory constraints. */
@@ -79,8 +79,8 @@
 
 /* Save some memory for the sky platform. */
 /*
-#undef UIP_CONF_DS6_NBR_NBU
-#define UIP_CONF_DS6_NBR_NBU     10
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
 #undef UIP_CONF_MAX_ROUTES
 #define UIP_CONF_MAX_ROUTES   10
 */
@@ -95,4 +95,4 @@
 #undef SICSLOWPAN_CONF_FRAG
 #define SICSLOWPAN_CONF_FRAG	1
 */
-#endif /* __PROJECT_ERBIUM_CONF_H__ */
+#endif /* PROJECT_ERBIUM_CONF_H_ */