diff --git a/configure/os/CONFIG_SITE.Common.RTEMS b/configure/os/CONFIG_SITE.Common.RTEMS
index a276bfa47..d2cccea67 100644
--- a/configure/os/CONFIG_SITE.Common.RTEMS
+++ b/configure/os/CONFIG_SITE.Common.RTEMS
@@ -1,12 +1,15 @@
+# CONFIG_SITE.Common.RTEMS
+#
+# $Revision-Id$
 #
 # Site-specific information for all RTEMS targets
-#
 #-------------------------------------------------------
 
 # Where to find RTEMS
 #
+# APS:
 RTEMS_VERSION = 4.10.2
-RTEMS_BASE = /usr/local/rtems/rtems-$(RTEMS_VERSION)
+RTEMS_BASE = /usr/local/vw/rtems/rtems-$(RTEMS_VERSION)
 
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
@@ -17,7 +20,7 @@ RTEMS_TOOLS = $(RTEMS_BASE)
 # A GeSys object is similar to a shared library.  It can be (un)loaded
 # at runtime by the Generic System loader which is available as a
 # patch against RTEMS.
-USE_GESYS=NO
+USE_GESYS = NO
 
 # If you're using neither BOOTP/DHCP nor FLASH to pick up your IOC
 # network configuration you must uncomment and specify your Internet
diff --git a/configure/os/CONFIG_SITE.Common.linux-arm b/configure/os/CONFIG_SITE.Common.linux-arm
index 466dffe15..0e78404cc 100644
--- a/configure/os/CONFIG_SITE.Common.linux-arm
+++ b/configure/os/CONFIG_SITE.Common.linux-arm
@@ -2,8 +2,8 @@
 #
 # $Revision-Id$
 #
-# Site Specific definitions for linux-arm target
-# Only the local epics system manager should modify this file
+# Site Specific definitions for all linux-arm targets
+#-------------------------------------------------------
 
 # NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
diff --git a/configure/os/CONFIG_SITE.Common.linux-xscale_be b/configure/os/CONFIG_SITE.Common.linux-xscale_be
index 0d28a4e2a..226aebac6 100644
--- a/configure/os/CONFIG_SITE.Common.linux-xscale_be
+++ b/configure/os/CONFIG_SITE.Common.linux-xscale_be
@@ -1,9 +1,12 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
+# $Revision-Id$
+#
 # Site specific definitions for linux-xscale_be target builds.
 #-------------------------------------------------------
 
 # Set GNU_DIR to point to directory containing the tool-chain
 
-GNU_DIR = /usr/local/xscale_be
+# APS:
+GNU_DIR = /usr/local/vw/xscale_be
 
diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-arm b/configure/os/CONFIG_SITE.linux-x86.linux-arm
index f27a6a0cd..528c9bc6c 100644
--- a/configure/os/CONFIG_SITE.linux-x86.linux-arm
+++ b/configure/os/CONFIG_SITE.linux-x86.linux-arm
@@ -1,4 +1,4 @@
-#  CONFIG_SITE.linux-x86.linux-arm
+# CONFIG_SITE.linux-x86.linux-arm
 #
 # $Revision-Id$
 #
@@ -8,7 +8,8 @@
 # Tools install path
 #GNU_DIR = /home/targetOS/linux-arm/host/x86-linux/gcc_3.3.3
 
-GNU_DIR = /net/phoebus/vw/zynq-2011.09
+# APS:
+GNU_DIR = /usr/local/vw/zynq-2011.09
 
 # GNU crosscompiler target name
 GNU_TARGET = arm-xilinx-linux-gnueabi