diff --git a/src/makeBaseApp/top/configure/CONFIG_APP b/src/makeBaseApp/top/configure/CONFIG_APP
index 0ee3950ea..f7bc2093f 100644
--- a/src/makeBaseApp/top/configure/CONFIG_APP
+++ b/src/makeBaseApp/top/configure/CONFIG_APP
@@ -1,7 +1,7 @@
 # CONFIG_APP
 
 include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(HOST_ARCH)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
 CONFIG=$(EPICS_BASE)/configure
 include $(CONFIG)/CONFIG
 INSTALL_LOCATION = $(TOP)
diff --git a/src/makeBaseApp/top/configure/Makefile b/src/makeBaseApp/top/configure/Makefile
index 87deb69df..dcf01f361 100644
--- a/src/makeBaseApp/top/configure/Makefile
+++ b/src/makeBaseApp/top/configure/Makefile
@@ -10,8 +10,8 @@ TARGETS = CONFIG_APP_INCLUDE
 
 include $(TOP)/configure/RULES
 
-ifeq ($(wildcard $(TOP)/configure/RELEASE.$(HOST_ARCH)),$(TOP)/configure/RELEASE.$(HOST_ARCH))
-CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE.$(HOST_ARCH)
+ifeq ($(wildcard $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)),$(TOP)/configure/RELEASE.$(HOST_ARCH))
+CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
 endif
 
 CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE $(TOP)/configure/CONFIG_APP
diff --git a/src/makeBaseApp/top/configure/RELEASE b/src/makeBaseApp/top/configure/RELEASE
index 2155ab9c8..708c430bd 100644
--- a/src/makeBaseApp/top/configure/RELEASE
+++ b/src/makeBaseApp/top/configure/RELEASE
@@ -1,4 +1,4 @@
 #RELEASE Location of external products
 EPICS_BASE=_EPICS_BASE_
 TEMPLATE_TOP=_TEMPLATE_TOP_
-MSI=/usr/local/epics/extensions/bin/$(HOST_ARCH)/msi
+MSI=/usr/local/epics/extensions/bin/$(EPICS_HOST_ARCH)/msi