diff --git a/configure_PSI.patch b/configure_PSI.patch
new file mode 100644
index 000000000..ff90f747e
--- /dev/null
+++ b/configure_PSI.patch
@@ -0,0 +1,335 @@
+Index: configure/os/CONFIG.Common.SL5-x86
+===================================================================
+RCS file: configure/os/CONFIG.Common.SL5-x86
+diff -N configure/os/CONFIG.Common.SL5-x86
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.SL5-x86	24 Nov 2011 11:13:26 -0000	1.5
+***************
+*** 0 ****
+--- 1,10 ----
++ # Include definitions common to linux pentium targets
++ include $(CONFIG)/os/CONFIG.Common.linux-x86
++ 
++ COMMANDLINE_LIBRARY = READLINE_NCURSES
++ 
++ OPT_CFLAGS += -g
++ OPT_CXXFLAGS += -g
++ 
++ ARCH_DEP_CFLAGS += -march=i686
++ ARCH_DEP_CFLAGS += -fno-strict-aliasing
+Index: configure/os/CONFIG.Common.SL5-x86_64
+===================================================================
+RCS file: configure/os/CONFIG.Common.SL5-x86_64
+diff -N configure/os/CONFIG.Common.SL5-x86_64
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.SL5-x86_64	24 Nov 2011 11:13:26 -0000	1.4
+***************
+*** 0 ****
+--- 1,9 ----
++ # Include definitions common to linux pentium targets
++ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
++ 
++ COMMANDLINE_LIBRARY = READLINE_NCURSES
++ 
++ OPT_CFLAGS += -g
++ OPT_CXXFLAGS += -g
++ 
++ ARCH_DEP_CFLAGS += -fno-strict-aliasing
+Index: configure/os/CONFIG.Common.SL6-x86
+===================================================================
+RCS file: configure/os/CONFIG.Common.SL6-x86
+diff -N configure/os/CONFIG.Common.SL6-x86
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.SL6-x86	24 Nov 2011 13:00:24 -0000	1.4
+***************
+*** 0 ****
+--- 1,10 ----
++ # Include definitions common to linux pentium targets
++ include $(CONFIG)/os/CONFIG.Common.linux-x86
++ 
++ COMMANDLINE_LIBRARY = READLINE
++ 
++ OPT_CFLAGS += -g
++ OPT_CXXFLAGS += -g
++ 
++ ARCH_DEP_CFLAGS += -march=i686
++ ARCH_DEP_CFLAGS += -fno-strict-aliasing
+Index: configure/os/CONFIG.Common.SL6-x86_64
+===================================================================
+RCS file: configure/os/CONFIG.Common.SL6-x86_64
+diff -N configure/os/CONFIG.Common.SL6-x86_64
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.SL6-x86_64	24 Nov 2011 13:00:25 -0000	1.4
+***************
+*** 0 ****
+--- 1,9 ----
++ # Include definitions common to linux pentium targets
++ include $(CONFIG)/os/CONFIG.Common.linux-x86_64
++ 
++ COMMANDLINE_LIBRARY = READLINE
++ 
++ OPT_CFLAGS += -g
++ OPT_CXXFLAGS += -g
++ 
++ ARCH_DEP_CFLAGS += -fno-strict-aliasing
+Index: configure/os/CONFIG_SITE.SL5-x86_64.Common
+===================================================================
+RCS file: configure/os/CONFIG_SITE.SL5-x86_64.Common
+diff -N configure/os/CONFIG_SITE.SL5-x86_64.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG_SITE.SL5-x86_64.Common	24 Nov 2011 09:00:53 -0000	1.2
+***************
+*** 0 ****
+--- 1,2 ----
++ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
++ CROSS_COMPILER_TARGET_ARCHS += SL5-x86
+Index: configure/os/CONFIG_SITE.SL5-x86.Common
+===================================================================
+RCS file: configure/os/CONFIG_SITE.SL5-x86.Common
+diff -N configure/os/CONFIG_SITE.SL5-x86.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG_SITE.SL5-x86.Common	24 Nov 2011 09:00:53 -0000	1.4
+***************
+*** 0 ****
+--- 1 ----
++ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+Index: configure/os/CONFIG_SITE.SL6-x86_64.Common
+===================================================================
+RCS file: configure/os/CONFIG_SITE.SL6-x86_64.Common
+diff -N configure/os/CONFIG_SITE.SL6-x86_64.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG_SITE.SL6-x86_64.Common	24 Nov 2011 09:05:10 -0000	1.1
+***************
+*** 0 ****
+--- 1,2 ----
++ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
++ CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+Index: configure/os/CONFIG_SITE.SL6-x86.Common
+===================================================================
+RCS file: configure/os/CONFIG_SITE.SL6-x86.Common
+diff -N configure/os/CONFIG_SITE.SL6-x86.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG_SITE.SL6-x86.Common	24 Nov 2011 09:05:10 -0000	1.1
+***************
+*** 0 ****
+--- 1 ----
++ include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+Index: configure/os/CONFIG.SL5-x86_64.Common
+===================================================================
+RCS file: configure/os/CONFIG.SL5-x86_64.Common
+diff -N configure/os/CONFIG.SL5-x86_64.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL5-x86_64.Common	22 Mar 2011 13:47:39 -0000	1.1
+***************
+*** 0 ****
+--- 1,3 ----
++ #CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
++ #Include definitions common to linux hosts
++ include $(CONFIG)/os/CONFIG.linux-x86_64.Common
+Index: configure/os/CONFIG.SL5-x86_64.SL5-x86_64
+===================================================================
+RCS file: configure/os/CONFIG.SL5-x86_64.SL5-x86_64
+diff -N configure/os/CONFIG.SL5-x86_64.SL5-x86_64
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL5-x86_64.SL5-x86_64	22 Mar 2011 13:47:39 -0000	1.1
+***************
+*** 0 ****
+--- 1,2 ----
++ # Include common linux definitions
++ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+Index: configure/os/CONFIG.SL5-x86.Common
+===================================================================
+RCS file: configure/os/CONFIG.SL5-x86.Common
+diff -N configure/os/CONFIG.SL5-x86.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL5-x86.Common	29 Nov 2010 14:55:50 -0000	1.1
+***************
+*** 0 ****
+--- 1,3 ----
++ #CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
++ #Include definitions common to linux hosts
++ include $(CONFIG)/os/CONFIG.linux-x86.Common
+Index: configure/os/CONFIG.SL5-x86.SL5-x86
+===================================================================
+RCS file: configure/os/CONFIG.SL5-x86.SL5-x86
+diff -N configure/os/CONFIG.SL5-x86.SL5-x86
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL5-x86.SL5-x86	29 Nov 2010 14:55:50 -0000	1.1
+***************
+*** 0 ****
+--- 1,2 ----
++ # Include common linux definitions
++ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+Index: configure/os/CONFIG.SL6-x86_64.Common
+===================================================================
+RCS file: configure/os/CONFIG.SL6-x86_64.Common
+diff -N configure/os/CONFIG.SL6-x86_64.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL6-x86_64.Common	24 Nov 2011 09:05:10 -0000	1.1
+***************
+*** 0 ****
+--- 1,3 ----
++ #CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
++ #Include definitions common to linux hosts
++ include $(CONFIG)/os/CONFIG.linux-x86_64.Common
+Index: configure/os/CONFIG.SL6-x86_64.SL6-x86
+===================================================================
+RCS file: configure/os/CONFIG.SL6-x86_64.SL6-x86
+diff -N configure/os/CONFIG.SL6-x86_64.SL6-x86
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL6-x86_64.SL6-x86	13 Dec 2011 15:55:28 -0000	1.3
+***************
+*** 0 ****
+--- 1,2 ----
++ # Include common linux definitions
++ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+Index: configure/os/CONFIG.SL6-x86_64.SL6-x86_64
+===================================================================
+RCS file: configure/os/CONFIG.SL6-x86_64.SL6-x86_64
+diff -N configure/os/CONFIG.SL6-x86_64.SL6-x86_64
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL6-x86_64.SL6-x86_64	24 Nov 2011 09:05:10 -0000	1.1
+***************
+*** 0 ****
+--- 1,2 ----
++ # Include common linux definitions
++ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+Index: configure/os/CONFIG.SL6-x86.Common
+===================================================================
+RCS file: configure/os/CONFIG.SL6-x86.Common
+diff -N configure/os/CONFIG.SL6-x86.Common
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL6-x86.Common	24 Nov 2011 09:05:10 -0000	1.1
+***************
+*** 0 ****
+--- 1,3 ----
++ #CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
++ #Include definitions common to linux hosts
++ include $(CONFIG)/os/CONFIG.linux-x86.Common
+Index: configure/os/CONFIG.SL6-x86.SL6-x86
+===================================================================
+RCS file: configure/os/CONFIG.SL6-x86.SL6-x86
+diff -N configure/os/CONFIG.SL6-x86.SL6-x86
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.SL6-x86.SL6-x86	24 Nov 2011 09:05:10 -0000	1.1
+***************
+*** 0 ****
+--- 1,2 ----
++ # Include common linux definitions
++ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+Index: configure/os/CONFIG.Common.V63-ppc603
+===================================================================
+RCS file: configure/os/CONFIG.Common.V63-ppc603
+diff -N configure/os/CONFIG.Common.V63-ppc603
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.V63-ppc603	24 Nov 2011 09:03:37 -0000	1.1
+***************
+*** 0 ****
+--- 1,8 ----
++ include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
++ VXWORKS_VERSION = 6.3
++ WIND_BASE = /afs/psi.ch/project/vxworks/WindRiverGPP3.3
++ NM = $(GNU_DIR)/powerpc-wrs-vxworks/bin/nm
++ WIND_HOME=$(WIND_BASE)
++ export WIND_HOME
++ 
++ ARCH_DEP_CFLAGS += -fno-strict-aliasing
+Index: configure/os/CONFIG.Common.V67-ppc604
+===================================================================
+RCS file: configure/os/CONFIG.Common.V67-ppc604
+diff -N configure/os/CONFIG.Common.V67-ppc604
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.V67-ppc604	1 Jul 2011 14:58:32 -0000	1.4
+***************
+*** 0 ****
+--- 1,9 ----
++ include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
++ VXWORKS_VERSION = 6.7
++ WIND_BASE = /afs/psi.ch/project/vxworks/WindRiverGPP3.7
++ NM = $(GNU_DIR)/powerpc-wrs-vxworks/bin/nm
++ WIND_HOME=$(WIND_BASE)
++ export WIND_HOME
++ 
++ ARCH_DEP_CFLAGS += -fno-strict-aliasing
++ ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
+Index: configure/os/CONFIG.Common.T2-ppc604
+===================================================================
+RCS file: configure/os/CONFIG.Common.T2-ppc604
+diff -N configure/os/CONFIG.Common.T2-ppc604
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.T2-ppc604	22 Mar 2011 13:27:48 -0000	1.2
+***************
+*** 0 ****
+--- 1,8 ----
++ include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
++ VXWORKS_VERSION = 5.5
++ WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2
++ 
++ #there is a problem with our ccppc and optimization
++ # -O and -O0 work, -O1 and higher are buggy
++ OPT_CFLAGS_YES = -O
++ OPT_CXXFLAGS_YES = -O
+Index: configure/os/CONFIG.Common.embeddedlinux-p2020
+===================================================================
+RCS file: configure/os/CONFIG.Common.embeddedlinux-p2020
+diff -N configure/os/CONFIG.Common.embeddedlinux-p2020
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.embeddedlinux-p2020	13 Dec 2011 15:56:19 -0000	1.1
+***************
+*** 0 ****
+--- 1,11 ----
++ # CONFIG.Common.embeddedlinux-p2020
++ #
++ # Include definitions common to all Linux targets
++ include $(CONFIG)/os/CONFIG.Common.linuxCommon
++ 
++ ARCH_CLASS = ppc
++ 
++ GNU_DIR=/afs/psi.ch/project/embeddedlinux/freescale/usr/local/gcc-4.3.74-eglibc-2.8.74-dp-2/powerpc-none-linux-gnuspe/powerpc-none-linux-gnuspe
++ 
++ 
++ COMMANDLINE_LIBRARY = EPICS
+Index: configure/os/CONFIG.Common.embeddedlinux-ppc405
+===================================================================
+RCS file: configure/os/CONFIG.Common.embeddedlinux-ppc405
+diff -N configure/os/CONFIG.Common.embeddedlinux-ppc405
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.embeddedlinux-ppc405	1 Jul 2011 14:53:52 -0000	1.2
+***************
+*** 0 ****
+--- 1,18 ----
++ # CONFIG.Common.embeddedlinux-ppc405
++ #
++ # Include definitions common to all Linux targets
++ include $(CONFIG)/os/CONFIG.Common.linuxCommon
++ 
++ ARCH_CLASS = ppc
++ 
++ GNU_DIR=/afs/psi.ch/project/embeddedlinux/virtex5
++ 
++ LINK.loadable_shrlib = $(CCC) -o $@ $(LOADABLE_SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
++ LINK.loadable_shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
++ 
++ ifeq ($(BUILD_CLASS),CROSS)
++     GNU_TARGET = powerpc-405-linux-gnu
++     CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
++ endif
++ 
++ COMMANDLINE_LIBRARY = EPICS
+Index: configure/os/CONFIG.Common.embeddedlinux-xscale_be
+===================================================================
+RCS file: configure/os/CONFIG.Common.embeddedlinux-xscale_be
+diff -N configure/os/CONFIG.Common.embeddedlinux-xscale_be
+*** /dev/null	1 Jan 1970 00:00:00 -0000
+--- configure/os/CONFIG.Common.embeddedlinux-xscale_be	13 Dec 2011 15:56:00 -0000	1.2
+***************
+*** 0 ****
+--- 1,8 ----
++ # Include definitions common to all Linux targets
++ include $(CONFIG)/os/CONFIG.Common.linuxCommon
++ 
++ ARCH_CLASS = xscale
++ 
++ GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
++ 
++ COMMANDLINE_LIBRARY = READLINE_CURSES