diff --git a/.gitignore b/.gitignore
index f48014d1c..af33a79de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 /include/
 /templates/
 /configure/*.local
-/modules/RELEASE.local
+/modules/RELEASE.*.local
 /modules/Makefile.local
 O.*/
 /QtC-*
diff --git a/modules/Makefile b/modules/Makefile
index 8bde5992c..a4f5c8abe 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -44,11 +44,12 @@ DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
 
 include $(TOP)/configure/RULES_DIRS
 
-# Ensure that RELEASE.local exists before doing anything else
+# Ensure that RELEASE.<host>.local exists before doing anything else
 all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
-    $(dirActionArchTargets) $(actionArchTargets): | RELEASE.local
+    $(dirActionArchTargets) $(actionArchTargets): \
+    | RELEASE.$(EPICS_HOST_ARCH).local
 
-RELEASE.local:
+RELEASE.$(EPICS_HOST_ARCH).local:
 	@echo EPICS_BASE = $(abspath $(INSTALL_LOCATION))> $@
 realclean:
-	$(RM) RELEASE.local
+	$(RM) RELEASE.$(EPICS_HOST_ARCH).local
diff --git a/modules/ca b/modules/ca
index 5dfd1fc0f..796279cc0 160000
--- a/modules/ca
+++ b/modules/ca
@@ -1 +1 @@
-Subproject commit 5dfd1fc0f0cad7dd967d76af0ea58637a8354bad
+Subproject commit 796279cc0ddfdbcd0361d672f99856b24fa1a05d
diff --git a/modules/database b/modules/database
index eac8865b7..f44bfd897 160000
--- a/modules/database
+++ b/modules/database
@@ -1 +1 @@
-Subproject commit eac8865b7f685988ed2dc3678574f9c1a226320b
+Subproject commit f44bfd897e26b13ee724c11bceaf94042c333700
diff --git a/modules/libcom b/modules/libcom
index 3ca5c2090..90de8efd5 160000
--- a/modules/libcom
+++ b/modules/libcom
@@ -1 +1 @@
-Subproject commit 3ca5c20907bbca004341efc1367de8b80be32087
+Subproject commit 90de8efd54bc7d075cc0df6f74228da4780bf505
diff --git a/modules/normativeTypes b/modules/normativeTypes
index abd029aa7..a2b635c2f 160000
--- a/modules/normativeTypes
+++ b/modules/normativeTypes
@@ -1 +1 @@
-Subproject commit abd029aa71e3a56d2163c8127a34751b77544ca1
+Subproject commit a2b635c2fe162a8d70b60882d492cbd40ab408e2
diff --git a/modules/pvAccess b/modules/pvAccess
index 2ca5744bb..736f7c3ff 160000
--- a/modules/pvAccess
+++ b/modules/pvAccess
@@ -1 +1 @@
-Subproject commit 2ca5744bb9451440b8d7ae31c4d0502b58b094c4
+Subproject commit 736f7c3ff3024d07a49a22ab485b4cee7af81227
diff --git a/modules/pvData b/modules/pvData
index b194bc05b..5976eb518 160000
--- a/modules/pvData
+++ b/modules/pvData
@@ -1 +1 @@
-Subproject commit b194bc05b17a7c23e6c4725c7d684cd21042fd86
+Subproject commit 5976eb5186c27e34d066eddb7fe58c02efad752d
diff --git a/modules/pvDatabase b/modules/pvDatabase
index 63214b98f..b26c0ecd7 160000
--- a/modules/pvDatabase
+++ b/modules/pvDatabase
@@ -1 +1 @@
-Subproject commit 63214b98f691af29f590522efb3a7d542aeb9e7e
+Subproject commit b26c0ecd713a9c87b891afbfef44d6109e13800a
diff --git a/modules/pva2pva b/modules/pva2pva
index 0159cdb77..135286e75 160000
--- a/modules/pva2pva
+++ b/modules/pva2pva
@@ -1 +1 @@
-Subproject commit 0159cdb77de9357cb9459f6daef0f025d20c2a3c
+Subproject commit 135286e75c0ded9e80767021cf656d8e6d5b949b
diff --git a/modules/pvaClient b/modules/pvaClient
index a21e5b591..74d381e68 160000
--- a/modules/pvaClient
+++ b/modules/pvaClient
@@ -1 +1 @@
-Subproject commit a21e5b59139a98d86606f87077d355ab71ec5d45
+Subproject commit 74d381e68cecf17d6e016c47d78078c6b315b81b
diff --git a/src/template/base/top/configure/RELEASE b/src/template/base/top/configure/RELEASE
index dbd742b45..a44ff608c 100644
--- a/src/template/base/top/configure/RELEASE
+++ b/src/template/base/top/configure/RELEASE
@@ -1,13 +1,12 @@
 # RELEASE - Location of external support modules
 #
-# IF YOU MAKE ANY CHANGES to this file you must subsequently
-# do a "gnumake rebuild" in this application's top level
-# directory.
+# IF YOU CHANGE ANY PATHS in this file or make API changes to
+# any modules it refers to, you should do a "make rebuild" in
+# this application's top level directory.
 #
-# The build process does not check dependencies against files
-# that are outside this application, thus you should do a
-# "gnumake rebuild" in the top level directory after EPICS_BASE
-# or any other external module pointed to below is rebuilt.
+# The EPICS build process does not check dependencies against
+# any files from outside the application, so it is safest to
+# rebuild it completely if any modules it depends on change.
 #
 # Host- or target-specific settings can be given in files named
 #  RELEASE.$(EPICS_HOST_ARCH).Common
@@ -15,7 +14,7 @@
 #  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 #
 # This file is parsed by both GNUmake and an EPICS Perl script,
-# so it can ONLY contain definititions of paths to other support
+# so it may ONLY contain definititions of paths to other support
 # modules, variable definitions that are used in module paths,
 # and include statements that pull in other RELEASE files.
 # Variables may be used before their values have been set.
@@ -36,8 +35,8 @@ EPICS_BASE = _EPICS_BASE_
 # other than EPICS_BASE:
 #RULES = $(MODULES)/build-rules
 
-# These allow developers to override the RELEASE variable settings
-# without having to modify the configure/RELEASE file itself.
+# These lines allow developers to override these RELEASE settings
+# without having to modify this file directly.
 -include $(TOP)/../RELEASE.local
+-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
 -include $(TOP)/configure/RELEASE.local
-