diff --git a/configure/os/CONFIG.Common.T2-ppc604 b/configure/os/CONFIG.Common.T2-ppc604
index 52c0650b5..3f71a6d5f 100644
--- a/configure/os/CONFIG.Common.T2-ppc604
+++ b/configure/os/CONFIG.Common.T2-ppc604
@@ -1,6 +1,6 @@
 include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
 VXWORKS_VERSION = 5.5.1
-WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2.1
+WIND_BASE = /opt/VxWorks/Tornado2.2.1
 
 #there is a problem with our ccppc and optimization
 # -O0 works, -O and -O1 and higher are buggy
diff --git a/configure/os/CONFIG.Common.moxa42-armv6l b/configure/os/CONFIG.Common.moxa42-armv6l
index 7788fbd4c..14d872831 100644
--- a/configure/os/CONFIG.Common.moxa42-armv6l
+++ b/configure/os/CONFIG.Common.moxa42-armv6l
@@ -3,7 +3,7 @@
 # Include definitions common to all Linux ARM targets
 include $(CONFIG)/os/CONFIG.Common.linux-arm
 
-GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/arm-linux-4.4.2-v4
+GNU_DIR=/opt/moxa/arm-linux-4.4.2-v4
 GNU_TARGET=arm
 ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
 ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
diff --git a/configure/os/CONFIG.Common.mvl40-xscale_be b/configure/os/CONFIG.Common.mvl40-xscale_be
index 77748202d..ce7775a25 100644
--- a/configure/os/CONFIG.Common.mvl40-xscale_be
+++ b/configure/os/CONFIG.Common.mvl40-xscale_be
@@ -7,7 +7,7 @@ COMMANDLINE_LIBRARY = READLINE_CURSES
 
 ARCH_CLASS = xscale
 
-GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
+GNU_DIR=/opt/moxa/xscale_be/armv5teb-montavista-linuxeabi
 
 ARCH_DEP_CFLAGS += -funwind-tables
 
diff --git a/configure/os/CONFIG_SITE.Common.vxWorksCommon b/configure/os/CONFIG_SITE.Common.vxWorksCommon
index 48c712230..04769f2d0 100644
--- a/configure/os/CONFIG_SITE.Common.vxWorksCommon
+++ b/configure/os/CONFIG_SITE.Common.vxWorksCommon
@@ -87,7 +87,7 @@ CODE_CXXFLAGS =
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
 #WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
-WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
 
 #--------------------------------------------------
 # Modules we cannot build with old compiler