diff --git a/modules/database/src/tools/Makefile b/modules/database/src/tools/Makefile
index a0ee2757d..78ae3e4ef 100644
--- a/modules/database/src/tools/Makefile
+++ b/modules/database/src/tools/Makefile
@@ -40,4 +40,27 @@ PERL_SCRIPTS += registerRecordDeviceDriver.pl
 
 HTMLS += dbdToHtml.html
 
+# Build Package Config Files
+
+FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
+C_CFLAGS += $(filter-out -g,$(filter-out -O%,$(filter-out -W%,$(CPPFLAGS))))
+C_CFLAGS += $(filter-out -g,$(filter-out -O%,$(filter-out -W%,$(CFLAGS))))
+PKGVARS += FINAL_LOCATION OS_CLASS CMPLR_CLASS C_CFLAGS LDFLAGS LDLIBS
+PKGVARS += EPICS_VERSION EPICS_REVISION EPICS_MODIFICATION EPICS_PATCH_LEVEL
+PKGVARS += CC CCC CPP AR LD
+PKGVARS += EPICS_BASE_IOC_LIBS
+
+EXPANDFLAGS += $(foreach var,$(PKGVARS),-D$(var)="$(strip $($(var)))")
+PKGCONFIG += epics-base-$(T_A).pc
+ifeq ($(T_A),$(EPICS_HOST_ARCH))
+PKGCONFIG += epics-base.pc
+endif
+
+EXPAND += $(PKGCONFIG:%=%@)
+CLEANS += epics-base-$(T_A).pc@
+
 include $(TOP)/configure/RULES
+
+epics-base-$(T_A).pc@: ../epics-base-arch.pc@
+	@$(RM) $@
+	@$(CP) $< $@
diff --git a/src/tools/epics-base-arch.pc@ b/modules/database/src/tools/epics-base-arch.pc@
similarity index 100%
rename from src/tools/epics-base-arch.pc@
rename to modules/database/src/tools/epics-base-arch.pc@
diff --git a/src/tools/epics-base.pc@ b/modules/database/src/tools/epics-base.pc@
similarity index 100%
rename from src/tools/epics-base.pc@
rename to modules/database/src/tools/epics-base.pc@
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 39497a417..0df179781 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -48,27 +48,4 @@ HTMLS += munch.html
 HTMLS += podToHtml.html
 HTMLS += podRemove.html
 
-# Build Package Config Files
-
-FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
-C_CFLAGS += $(filter-out -g,$(filter-out -O%,$(filter-out -W%,$(CPPFLAGS))))
-C_CFLAGS += $(filter-out -g,$(filter-out -O%,$(filter-out -W%,$(CFLAGS))))
-PKGVARS += FINAL_LOCATION OS_CLASS CMPLR_CLASS C_CFLAGS LDFLAGS LDLIBS
-PKGVARS += EPICS_VERSION EPICS_REVISION EPICS_MODIFICATION EPICS_PATCH_LEVEL
-PKGVARS += CC CCC CPP AR LD
-PKGVARS += EPICS_BASE_IOC_LIBS
-
-EXPANDFLAGS += $(foreach var,$(PKGVARS),-D$(var)="$(strip $($(var)))")
-PKGCONFIG += epics-base-$(T_A).pc
-ifeq ($(T_A),$(EPICS_HOST_ARCH))
-PKGCONFIG += epics-base.pc
-endif
-
-EXPAND += $(PKGCONFIG:%=%@)
-CLEANS += epics-base-$(T_A).pc@
-
 include $(TOP)/configure/RULES
-
-epics-base-$(T_A).pc@: ../epics-base-arch.pc@
-	@$(RM) $@
-	@$(CP) $< $@