diff --git a/boards/common/slwstk6000b/Makefile.include b/boards/common/slwstk6000b/Makefile.include
index c216f7d05f..a46b811661 100644
--- a/boards/common/slwstk6000b/Makefile.include
+++ b/boards/common/slwstk6000b/Makefile.include
@@ -1,7 +1,5 @@
-include $(RIOTBOARD)/common/slwstk6000b/module-info.mk
-
 INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/include
-# add module specific includes
+# add BOARD_MODULE specific includes
 INCLUDES += -I$(RIOTBOARD)/common/slwstk6000b/modules/$(BOARD_MODULE)/include
 
 # set default port depending on operating system
@@ -12,7 +10,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # setup JLink for flashing
-export JLINK_DEVICE := $(MODULE_JLINK_DEVICE)
+include $(RIOTBOARD)/common/slwstk6000b/slwstk6000b.info.mk
+export JLINK_DEVICE = $(word 2, $(SLWSTK6000B_MOTHERBOARD_VARS_$(BOARD_MODULE)))
 
 # include board common
 include $(RIOTBOARD)/common/silabs/Makefile.include
diff --git a/boards/slwstk6000b-slwrb4150a/Makefile.include b/boards/slwstk6000b-slwrb4150a/Makefile.include
index fc9870821d..bf1a2c84f4 100644
--- a/boards/slwstk6000b-slwrb4150a/Makefile.include
+++ b/boards/slwstk6000b-slwrb4150a/Makefile.include
@@ -1,3 +1 @@
-BOARD_MODULE = slwrb4150a
-
 include $(RIOTBOARD)/common/slwstk6000b/Makefile.include
diff --git a/boards/slwstk6000b-slwrb4162a/Makefile.include b/boards/slwstk6000b-slwrb4162a/Makefile.include
index a5d9d7c157..bf1a2c84f4 100644
--- a/boards/slwstk6000b-slwrb4162a/Makefile.include
+++ b/boards/slwstk6000b-slwrb4162a/Makefile.include
@@ -1,3 +1 @@
-BOARD_MODULE = slwrb4162a
-
 include $(RIOTBOARD)/common/slwstk6000b/Makefile.include