diff --git a/riotOS-nrf52840dk-ble/Makefile b/riotOS-nrf52840dk-ble/Makefile
index b4bf3d3..599f701 100644
--- a/riotOS-nrf52840dk-ble/Makefile
+++ b/riotOS-nrf52840dk-ble/Makefile
@@ -11,15 +11,15 @@ WOLFBOOT=../wolfBoot
 WOLFBOOT_BIN=$(WOLFBOOT)/wolfboot.bin
 
 
-all: $(BOOT_IMG) $(WOLFBOOT_BIN)
+all: $(WOLFBOOT_BIN)
 
 $(BOOT_IMG):
+	@cp -f ./wolfboot-config $(WOLFBOOT)/.config
+	@make -C $(WOLFBOOT) clean
 	make wolfboot -C $(APP_SRC) IMAGE_VERSION=1
 
 
-$(WOLFBOOT_BIN): FORCE
-	@cp -f ./wolfboot-config $(WOLFBOOT)/.config
-	@make -C $(WOLFBOOT) clean
+$(WOLFBOOT_BIN): $(BOOT_IMG)
 	@make -C $(WOLFBOOT) wolfboot.bin
 
 clean: FORCE
diff --git a/riotOS-nrf52840dk-ble/wolfboot.mk b/riotOS-nrf52840dk-ble/wolfboot.mk
index 6ec923b..27fe311 100644
--- a/riotOS-nrf52840dk-ble/wolfboot.mk
+++ b/riotOS-nrf52840dk-ble/wolfboot.mk
@@ -19,8 +19,9 @@ wolfboot-create-key: $(WOLFBOOT_KEYFILE)
 
 $(WOLFBOOT_KEYFILE):
 	make -C $(WOLFBOOT) clean
-	make -C $(WOLFBOOT) distclean
-	make -C $(WOLFBOOT) TARGET=nrf52 DEBUG=0 ecc256.der  \
+	rm -f $(WOLFBOOT)/ecc256.der
+	rm -f $(WOLFBOOT)/src/ecc256_pub_key.c
+	cd $(WOLFBOOT) && make ecc256.der && make include/target.h
 
 wolfboot: wolfboot-create-key link
 	@$(COLOR_ECHO)