diff --git a/Makefile b/Makefile
index b27e580af..ab54c581d 100644
--- a/Makefile
+++ b/Makefile
@@ -444,10 +444,10 @@ GENERATED_CONFIG = $(CLI_DIR)/config-generated.go
 
 GENERATED_GO_FILES += $(GENERATED_CONFIG)
 
-$(GENERATED_CONFIG): Makefile VERSION
+$(GENERATED_CONFIG): $(MAKEFILE_LIST) VERSION
 	$(QUIET_GENERATE)echo "$$GENERATED_CODE" >$@
 
-$(TARGET_OUTPUT): $(EXTRA_DEPS) $(SOURCES) $(GENERATED_GO_FILES) $(GENERATED_FILES) Makefile | show-summary
+$(TARGET_OUTPUT): $(EXTRA_DEPS) $(SOURCES) $(GENERATED_GO_FILES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
 	$(QUIET_BUILD)(cd $(CLI_DIR) && go build $(BUILDFLAGS) -o $@ .)
 
 $(SHIMV2_OUTPUT):
@@ -464,12 +464,12 @@ $(SHIMV2_OUTPUT):
 	show-summary \
 	show-variables
 
-$(TARGET).coverage: $(SOURCES) $(GENERATED_FILES) Makefile
+$(TARGET).coverage: $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST)
 	$(QUIET_TEST)go test -o $@ -covermode count
 
 GENERATED_FILES += $(CONFIGS)
 
-$(GENERATED_FILES): %: %.in Makefile VERSION
+$(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION
 	$(QUIET_CONFIG)$(SED) \
 		-e "s|@COMMIT@|$(COMMIT)|g" \
 		-e "s|@VERSION@|$(VERSION)|g" \