diff --git a/Makefile b/Makefile
index d3a3bdebf..d60c35e95 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,14 @@ define rule_label
 endef
 
 define rule_for
-$(addprefix $$(BUILD_DIR)/,$(strip $(2))): $(strip $(3)) | $$$$(@D)/.
-	@ echo "$(shell printf "%-8s" $(strip $(1)))$$(@:$$(BUILD_DIR)/%=%)"
-	$(Q) $(4)
 ifeq ($(strip $(5)),with_local_version)
 $(addprefix $$(BUILD_DIR)/,$(strip $(2))): $(addprefix $$(BUILD_DIR)/,$(strip $(3)))
 	@ echo "$(shell printf "%-8s" $(strip $(1)))$$(@:$$(BUILD_DIR)/%=%)"
 	$(Q) $(4)
 endif
+$(addprefix $$(BUILD_DIR)/,$(strip $(2))): $(strip $(3)) | $$$$(@D)/.
+	@ echo "$(shell printf "%-8s" $(strip $(1)))$$(@:$$(BUILD_DIR)/%=%)"
+	$(Q) $(4)
 endef
 
 # Define rules for targets
diff --git a/build/targets.device.mak b/build/targets.device.mak
index 60e5f9f33..9d1c69e3c 100644
--- a/build/targets.device.mak
+++ b/build/targets.device.mak
@@ -5,7 +5,8 @@ extensions += .dfu .hex .bin
 
 $(eval $(call rule_for, \
   DFUSE, %.dfu, %.$$(EXE), \
-  $$(PYTHON) build/device/elf2dfu.py $$< $$@ \
+  $$(PYTHON) build/device/elf2dfu.py $$< $$@, \
+  with_local_version \
 ))
 
 $(eval $(call rule_for, \