diff --git a/LUFA/Build/lufa.dfu.in b/LUFA/Build/lufa.dfu.in
index 63789936b1..f57c20bcfe 100644
--- a/LUFA/Build/lufa.dfu.in
+++ b/LUFA/Build/lufa.dfu.in
@@ -53,30 +53,30 @@ MSG_REMOVE_CMD := ' [RM]      :'
 MSG_DFU_CMD    := ' [DFU]     :'
 
 flip: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Programming FLASH with batchisp using \"$(TARGET).hex\"
+	@echo $(MSG_DFU_CMD) Programming FLASH with batchisp using \"$<\"
 	batchisp -hardware usb -device $(MCU) -operation erase f
-	batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program
+	batchisp -hardware usb -device $(MCU) -operation loadbuffer $< program
 	batchisp -hardware usb -device $(MCU) -operation start reset 0
 
 flip-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Copying EEP file to temporary file \"$(TARGET)eep.hex\"
-	cp $(TARGET).eep $(TARGET)eep.hex
-	@echo $(MSG_DFU_CMD) Programming EEPROM with batchisp using \"$(TARGET).eep\"
+	@echo $(MSG_DFU_CMD) Copying EEP file to temporary file \"$<.hex\"
+	cp $< $<.hex
+	@echo $(MSG_DFU_CMD) Programming EEPROM with batchisp using \"$<.hex\"
 	batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase
-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program
+	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $<.hex program
 	batchisp -hardware usb -device $(MCU) -operation start reset 0
-	@echo $(MSG_DFU_CMD) Removing temporary file \"$(TARGET)eep.hex\"
-	rm $(TARGET)eep.hex
+	@echo $(MSG_DFU_CMD) Removing temporary file \"$<.hex\"
+	rm $<.hex
 	
 dfu: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Programming FLASH with dfu-programmer using \"$(TARGET).hex\"
+	@echo $(MSG_DFU_CMD) Programming FLASH with dfu-programmer using \"$<\"
 	dfu-programmer $(MCU) erase
-	dfu-programmer $(MCU) flash $(TARGET).hex
+	dfu-programmer $(MCU) flash $<
 	dfu-programmer $(MCU) reset
 
 dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$(TARGET).eep\"
-	dfu-programmer $(MCU) eeprom-flash $(TARGET).eep
+	@echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$<\"
+	dfu-programmer $(MCU) eeprom-flash $<
 	dfu-programmer $(MCU) reset
 	
 # Phony build targets for this module