diff --git a/Makefile.rules b/Makefile.rules
index 948b88099f3..351a3450601 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1478,10 +1478,10 @@ endif # LLVMC_BUILD_AUTOGENERATED_INC
 
 ifdef CLANG_BUILD_DIAGNOSTICS_INC
 
-$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic%Kinds.td Diagnostic.td $(TBLGEN)
-	$(Echo) "Building Clang $(<F) diagnostic tables with tblgen"
+$(ObjDir)/Diagnostic%Kinds.inc.tmp : Diagnostic.td Diagnostic%Kinds.td $(TBLGEN)
+	$(Echo) "Building Clang $(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) diagnostic tables with tblgen"
 	$(Verb) $(MKDIR) $(@D)
-	$(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.td,%,$(<F)) -o $(call SYSPATH, $@) Diagnostic.td
+	$(Verb) $(TableGen) -gen-clang-diags-defs -clang-component=$(patsubst Diagnostic%Kinds.inc.tmp,%,$(@F)) -o $(call SYSPATH, $@) $<
 
 endif