diff --git a/cpu/rl78/Makefile.rl78 b/cpu/rl78/Makefile.rl78
index 62853e42d..a20382b7f 100755
--- a/cpu/rl78/Makefile.rl78
+++ b/cpu/rl78/Makefile.rl78
@@ -42,12 +42,20 @@ ifdef IAR
   DEVICE ?= r5f100ll
 
   # According to "rl78/config/devices/RL78 - G13/r5f100ll.menu", the R5F100LLA has core 1.
-  CORE       ?= 1
+  RL78_CORE  ?= 1
 
   # Default library configuration (n = normal, f = full):
   LIB_CONFIG ?= n
 
-  IAR_PATH ?= C:\\Program\ Files\\IAR\ Systems\\Embedded\ Workbench\ 6.5\\rl78
+  ifeq ($(IAR_PATH),)
+    IAR_SUBPATH := $(shell ls "C:\Program Files\IAR Systems" | tail -1 )
+
+    ifeq ($(IAR_SUBPATH),)
+      $(error Unable to find the IAR installation path. Please specify IAR_PATH. For example: make IAR_PATH="C:\\Program\ Files\\IAR\ Systems\\Embedded\ Workbench\ 6.5\\rl78" )
+    endif
+
+    IAR_PATH := "C:\Program Files\IAR Systems\$(IAR_SUBPATH)\rl78"
+  endif
 
   CC = $(IAR_PATH)\\bin\\iccrl78
   LD = $(IAR_PATH)\\bin\\xlink
@@ -55,7 +63,7 @@ ifdef IAR
 
   CFLAGS  += --silent
   CFLAGS  += --debug
-  CFLAGS  += --core rl78_$(CORE)
+  CFLAGS  += --core rl78_$(RL78_CORE)
   CFLAGS  += --code_model $(CODE_MODEL)
   CFLAGS  += --data_model $(DATA_MODEL)
   CFLAGS  += -I$(IAR_PATH)\\lib
@@ -73,7 +81,7 @@ ifdef IAR
 
   AROPTS ?= -S
   
-  TARGET_LIBFILES += $(IAR_PATH)\\lib\\dlrl78$(CODE_MODEL)$(DATA_MODEL)$(CORE)$(LIB_CONFIG).r87
+  TARGET_LIBFILES += $(IAR_PATH)\\lib\\dlrl78$(CODE_MODEL)$(DATA_MODEL)$(RL78_CORE)$(LIB_CONFIG).r87
 
 CUSTOM_RULE_C_TO_O = 1
 %.o: %.c
diff --git a/platform/eval-adf7xxxmb4z/README.md b/platform/eval-adf7xxxmb4z/README.md
index bcee2a5b8..1faa1a625 100644
--- a/platform/eval-adf7xxxmb4z/README.md
+++ b/platform/eval-adf7xxxmb4z/README.md
@@ -19,11 +19,10 @@ Convert the RPM package to a Debian package and install it:
 
 Obtain the Contiki source code:
 
-	git clone -b rl78-dev https://github.com/hexluthor/contiki.git
+	git clone https://github.com/contiki-os/contiki.git
 
 Build Contiki's example-abc:
 
-	cd contiki/examples/rime
 	make -C contiki/examples/rime TARGET=eval-adf7xxxmb4z example-abc.eval-adf7xxxmb4z.srec
 
 The code can be flashed to the eval board using
@@ -80,10 +79,10 @@ Download and install
 
 Obtain the Contiki source code using [git](http://git-scm.com/download/win):
 
-	git clone -b rl78-dev https://github.com/hexluthor/contiki.git
+	git clone https://github.com/contiki-os/contiki.git
 
 Alternatively, download a
-[zip file](https://github.com/hexluthor/contiki/archive/rl78-dev.zip)
+[zip file](https://github.com/contiki-os/contiki/archive/master.zip)
 of the latest source.
 
 Build Contiki's example-abc using the RL78 Toolchain shell.
@@ -109,10 +108,10 @@ and [make](http://gnuwin32.sourceforge.net/downlinks/make.php).
 
 Obtain the Contiki source code using [git](http://git-scm.com/download/win):
 
-	git clone -b rl78-dev https://github.com/hexluthor/contiki.git
+	git clone https://github.com/contiki-os/contiki.git
 
 Alternatively, download a
-[zip file](https://github.com/hexluthor/contiki/archive/rl78-dev.zip)
+[zip file](https://github.com/contiki-os/contiki/archive/master.zip)
 of the latest source.
 
 Build Contiki's example-abc.
diff --git a/platform/eval-adf7xxxmb4z/contiki-conf.h b/platform/eval-adf7xxxmb4z/contiki-conf.h
index cc033bd2b..407251e6e 100644
--- a/platform/eval-adf7xxxmb4z/contiki-conf.h
+++ b/platform/eval-adf7xxxmb4z/contiki-conf.h
@@ -76,7 +76,7 @@
 
 #define NETSTACK_CONF_NETWORK rime_driver
 #define NETSTACK_CONF_MAC     csma_driver
-#define NETSTACK_CONF_RDC     sicslowmac_driver
+#define NETSTACK_CONF_RDC     nullrdc_driver
 #define NETSTACK_CONF_RADIO   adf7023_driver
 #define NETSTACK_CONF_FRAMER  framer_802154