diff --git a/LUFA/Build/lufa_cppcheck.mk b/LUFA/Build/lufa_cppcheck.mk
index b247ee73d85375d9b10c6ec7f1a159420f87cce4..65f7db8c58b902c5be8ed2a8c15ceb3e20ccf184 100644
--- a/LUFA/Build/lufa_cppcheck.mk
+++ b/LUFA/Build/lufa_cppcheck.mk
@@ -93,12 +93,12 @@ endif
 MSG_CPPCHECK_CMD         := ' [CPPCHECK]:'
 
 # Checks the CPPCheck configuration as used in the user project, to determine if any paths are missing or invalid
-cppcheck-config:
+cppcheck-config: $(MAKEFILE_LIST)
 	@echo $(MSG_CPPCHECK_CMD) Checking cppcheck configuration check on source files
 	cppcheck $(BASE_CPPCHECK_FLAGS) --check-config $(CPPCHECK_FLAGS) $(SRC)
 
 # Runs a static analysis using CPPCheck to determine if there are any issues
-cppcheck:
+cppcheck: $(MAKEFILE_LIST)
 	@echo $(MSG_CPPCHECK_CMD) Performing static analysis on source files
 	cppcheck $(BASE_CPPCHECK_FLAGS) --enable=$(CPPCHECK_ENABLE) $(CPPCHECK_SUPPRESS:%=--suppress=%) $(CPPCHECK_FLAGS) $(SRC)
 
diff --git a/LUFA/Build/lufa_dfu.mk b/LUFA/Build/lufa_dfu.mk
index ddb7aab7a83c72ad9bbe21fb0ef3bb6cc8923aab..36c8461917be705f5a06c88e2071ef6f1b63b37f 100644
--- a/LUFA/Build/lufa_dfu.mk
+++ b/LUFA/Build/lufa_dfu.mk
@@ -71,13 +71,13 @@ flip: $(TARGET).hex $(MAKEFILE_LIST)
 
 # Programs in the target EEPROM memory using BATCHISP, the command line tool used by FLIP
 flip-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Copying EEP file to temporary file \"$<.hex\"
+	@echo $(MSG_COPY_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 $<.hex program
 	batchisp -hardware usb -device $(MCU) -operation start reset 0
-	@echo $(MSG_DFU_CMD) Removing temporary file \"$<.hex\"
+	@echo $(MSG_REMOVE_CMD) Removing temporary file \"$<.hex\"
 	rm $<.hex
 	
 # Programs in the target FLASH memory using DFU-PROGRAMMER
diff --git a/LUFA/Build/lufa_doxygen.mk b/LUFA/Build/lufa_doxygen.mk
index fe53b25247224d7bd72f5cf32c26c06393d1061d..cf66cf4ad498a54b41bb1390deb3fd2ee9c5abbc 100644
--- a/LUFA/Build/lufa_doxygen.mk
+++ b/LUFA/Build/lufa_doxygen.mk
@@ -82,17 +82,17 @@ $(DOXYGEN_CONF):
 	$(error Doxygen configuration file $@ does not exist)
 
 # Builds the project documentation using the specified configuration file and the DOXYGEN tool
-doxygen: $(DOXYGEN_CONF)
+doxygen: $(DOXYGEN_CONF) $(MAKEFILE_LIST)
 	@echo $(MSG_DOXYGEN_CMD) Configuration file \"$(DOXYGEN_CONF)\" with parameters \"$(DOXYGEN_OVERRIDE_PARAMS)\"
 	$(DOXYGEN_CMD)
 
 # Upgrades an existing Doxygen configuration file to the latest Doxygen template, preserving settings
-doxygen_upgrade: $(DOXYGEN_CONF)
+doxygen_upgrade: $(DOXYGEN_CONF) $(MAKEFILE_LIST)
 	@echo $(MSG_DOXYGEN_CMD) Upgrading configuration file \"$(DOXYGEN_CONF)\" with latest template
 	doxygen -u $(DOXYGEN_CONF) > /dev/null
 
 # Creates a new Doxygen configuration file with the set file name
-doxygen_create:
+doxygen_create: $(MAKEFILE_LIST)
 	@echo $(MSG_DOXYGEN_CMD) Creating new configuration file \"$(DOXYGEN_CONF)\" with latest template
 	doxygen -g $(DOXYGEN_CONF) > /dev/null