diff --git a/config/Makefile.Host b/config/Makefile.Host
index 459f807ed..3b18c547c 100644
--- a/config/Makefile.Host
+++ b/config/Makefile.Host
@@ -11,40 +11,14 @@ CONFIGS += CONFIG_BASE_VERSION
 CONFIGS += CONFIG_COMMON
 CONFIGS += CONFIG_ENV
 
-CONFIGS += CONFIG.WIN32
-CONFIGS += CONFIG.pc486
-CONFIGS += CONFIG.Linux
-CONFIGS += CONFIG.alpha
-CONFIGS += CONFIG.hp700
-CONFIGS += CONFIG.sgi
-CONFIGS += CONFIG.solaris
-CONFIGS += CONFIG.sun4
-CONFIGS += CONFIG.hkv2f
-CONFIGS += CONFIG.mv147
-CONFIGS += CONFIG.mv162
-CONFIGS += CONFIG.mv162lc
-CONFIGS += CONFIG.mv167
-CONFIGS += CONFIG.niCpu030
+CONFIGS += $(BUILD_ARCHS:%=CONFIG.%)
 
 CONFIGS += CONFIG.Vx.68k
 
 CONFIGS += CONFIG_SITE
 CONFIGS += CONFIG_SITE_ENV
 
-CONFIGS += CONFIG_SITE.WIN32
-CONFIGS += CONFIG_SITE.pc486
-CONFIGS += CONFIG_SITE.Linux
-CONFIGS += CONFIG_SITE.alpha
-CONFIGS += CONFIG_SITE.hp700
-CONFIGS += CONFIG_SITE.sgi
-CONFIGS += CONFIG_SITE.solaris
-CONFIGS += CONFIG_SITE.sun4
-CONFIGS += CONFIG_SITE.hkv2f
-CONFIGS += CONFIG_SITE.mv147
-CONFIGS += CONFIG_SITE.mv162lc
-CONFIGS += CONFIG_SITE.mv162
-CONFIGS += CONFIG_SITE.mv167
-CONFIGS += CONFIG_SITE.niCpu030
+CONFIGS += $(BUILD_ARCHS:%=CONFIG_SITE.%)
 
 CONFIGS += RULES.Host
 CONFIGS += RULES.Vx
diff --git a/config/RULES_ARCHS b/config/RULES_ARCHS
index caa2bb660..5a42b9fa5 100644
--- a/config/RULES_ARCHS
+++ b/config/RULES_ARCHS
@@ -51,12 +51,17 @@ $(crossActionArchTargets) :
 $(crossArchs) : 
 endif
 
-$(hostDirs) : 
+$(hostDirs) : $(EPICS_BASE)/config/makeMakefile.pl
 	$(PERL) $(EPICS_BASE)/config/makeMakefile.pl $@ $(BUILD_TYPE)
 
-$(crossDirs) : 
+$(crossDirs) : $(EPICS_BASE)/config/makeMakefile.pl
 	$(PERL) $(EPICS_BASE)/config/makeMakefile.pl $@ Vx
 
+ifneq ($(EPICS_BASE),$(TOP))
+$(EPICS_BASE)/config/makeMakefile.pl : $(TOP)/config/makeMakefile.pl
+	$(CP) $(TOP)/config/makeMakefile.pl $(EPICS_BASE)/config/makeMakefile.pl
+endif
+
 #
 # host/cross action targets
 #