diff --git a/packages/Makefile b/packages/Makefile
index 49fd2b6bad..0e34e60e1a 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -351,6 +351,7 @@ endif
 ifdef UNITDIR_FPMAKE_FPMKUNIT
 override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
+SUB_FPMAKE_SRCS=$(wildcard */fpmake.pp)
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCSUBDIR=packages
 ifdef REQUIRE_UNITSDIR
@@ -1640,7 +1641,7 @@ endif
 .NOTPARALLEL:
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap
-fpmake$(SRCEXEEXT): fpmake.pp
+fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc
 	$(MAKE) -C fpmkunit bootstrap
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
 all:	fpmake$(SRCEXEEXT)
diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc
index 8a15b87fd1..8c1a96401d 100644
--- a/packages/Makefile.fpc
+++ b/packages/Makefile.fpc
@@ -43,6 +43,8 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT
 override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)
 endif
 
+SUB_FPMAKE_SRCS=$(wildcard */fpmake.pp)
+
 [rules]
 # Do not pass the Makefile's unit and binary target locations. fpmake uses it's own.
 override FPCOPT:=$(filter-out -FU%,$(FPCOPT))
@@ -63,7 +65,7 @@ endif
 
 fpmkunit_clean_bootstrap:
 	$(MAKE) -C fpmkunit clean_bootstrap
-fpmake$(SRCEXEEXT): fpmake.pp
+fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc
 	$(MAKE) -C fpmkunit bootstrap
 	$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
 all:	fpmake$(SRCEXEEXT)