diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 849cb84b6..64f8385d5 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1125,7 +1125,12 @@ submake-pagecompression:
 submake-libalarmclient:
 	$(MAKE) -C $(top_builddir)/src/lib/alarm
 
-submake-kwlist:
+submake-kwlist: $(top_srcdir)/src/include/parser/kwlist_d.h
+
+submake-kwlist-clean:
+	rm $(top_srcdir)/src/include/parser/kwlist_d.h
+
+$(top_srcdir)/src/include/parser/kwlist_d.h: $(top_srcdir)/src/include/parser/kwlist.h $(GEN_KEYWORDLIST_DEPS)
 	$(GEN_KEYWORDLIST) --extern -o $(top_srcdir)/src/include/parser $(top_srcdir)/src/include/parser/kwlist.h
 
 .PHONY: submake-libpq submake-libpgport  submake-libplpgsql submake-libalarmclient submake-pagecompression submake-kwlist
diff --git a/src/common/backend/parser/Makefile b/src/common/backend/parser/Makefile
index f433ee23b..d99865f68 100644
--- a/src/common/backend/parser/Makefile
+++ b/src/common/backend/parser/Makefile
@@ -95,9 +95,8 @@ hint_gram.o keywords.o parser.o: hint_gram.hpp  submake-kwlist
 
 # gram.cpp, gram.hpp, and scan.inc are in the distribution tarball, so they
 # are not cleaned here.
-clean distclean maintainer-clean:
+clean distclean maintainer-clean: submake-kwlist-clean
 	rm -f lex.backup hint_gram.cpp
-	rm -f kwlist_d.h
 
 
 maintainer-check:
diff --git a/src/common/interfaces/ecpg/preproc/Makefile b/src/common/interfaces/ecpg/preproc/Makefile
index a3befecaf..ce68f5bf3 100644
--- a/src/common/interfaces/ecpg/preproc/Makefile
+++ b/src/common/interfaces/ecpg/preproc/Makefile
@@ -93,7 +93,7 @@ ecpg_kwlist_d.h: ecpg_kwlist.h $(GEN_KEYWORDLIST_DEPS)
 	$(GEN_KEYWORDLIST) --varname ScanECPGKeywords $<
 
 # Force these dependencies to be known even without dependency info built:
-ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.hpp kwlist_d.h
+ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.hpp submake-kwlist
 ecpg_keywords.o: ecpg_kwlist_d.h
 c_keywords.o: c_kwlist_d.h
 keywords.o: $(top_srcdir)/src/include/parser/kwlist.h
@@ -101,9 +101,6 @@ keywords.o: $(top_srcdir)/src/include/parser/kwlist.h
 kwlookup.cpp: % : $(top_srcdir)/src/common/backend/parser/%
 	rm -f $@ && $(LN_S) $< .
 
-kwlist_d.h: $(top_srcdir)/src/include/parser/kwlist.h $(GEN_KEYWORDLIST_DEPS)
-	$(GEN_KEYWORDLIST) --extern -o $(top_srcdir)/src/include/parser $(top_srcdir)/src/include/parser/kwlist.h
-
 distprep: preproc.y preproc.cpp preproc.hpp pgc.cpp
 
 install: all installdirs
diff --git a/src/common/interfaces/libpq/frontend_parser/Makefile b/src/common/interfaces/libpq/frontend_parser/Makefile
index c78a7e65d..37c3e8cd9 100644
--- a/src/common/interfaces/libpq/frontend_parser/Makefile
+++ b/src/common/interfaces/libpq/frontend_parser/Makefile
@@ -57,7 +57,7 @@ removefiles:
 	rm -f fe-*.cpp
 all:softlinks scan.o gram.o ${OBJS} all-static-lib
 
-clean: clean-lib
+clean: clean-lib submake-kwlist-clean
 	rm -f gram.cpp gram.hpp scan.cpp
 	rm -f *.o *.a
 	rm -f test