diff --git a/csh.env b/csh.env
index a8952a6..4347e4b 100644
--- a/csh.env
+++ b/csh.env
@@ -5,39 +5,39 @@
 setenv ADA_INCLUDE_PATH '/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adainclude'
 setenv ADA_OBJECTS_PATH '/usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib'
 setenv ANT_HOME '/usr/share/ant'
+setenv AWS_AUTO_SCALING_HOME '/opt/aws-as-tools'
 setenv CG_COMPILER_EXE '/opt/bin/cgc'
 setenv CG_INC_PATH '/opt/nvidia-cg-toolkit/include'
-setenv CG_LIB_PATH '/opt/nvidia-cg-toolkit/lib64'
+setenv CG_LIB_PATH '/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
 setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt /usr/share/config'
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 setenv CVS_RSH 'ssh'
 setenv DCCC_PATH '/usr/lib64/distcc/bin'
 setenv DISTCC_LOG ''
 setenv DISTCC_VERBOSE '0'
-setenv ES_BASHCOMP_DIRS '/usr/share/bash-completion/completions'
 setenv GCC_SPECS ''
 setenv GSETTINGS_BACKEND 'dconf'
 setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
 setenv HG '/usr/bin/hg'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
 setenv LANG 'de_DE.utf8'
 setenv LC_COLLATE 'C'
 setenv LC_MESSAGES 'en_US.utf8'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv OPENCL_PROFILE 'nvidia'
 setenv OPENGL_PROFILE 'nvidia'
 setenv PACKAGE_MANAGER 'paludis'
 setenv PAGER '/usr/bin/most'
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin'
-setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin:/opt/aws-as-tools/bin'
+setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.8/html/library'
 setenv PYTHONDOCS_3_2 '/usr/share/doc/python-docs-3.2.5/html/library'
 setenv QT_GRAPHICSSYSTEM 'raster'
 setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/opt/aws-as-tools/bin'
 setenv RUBYOPT '-rauto_gem'
 setenv SBCL_HOME '/usr/lib64/sbcl'
 setenv SBCL_SOURCE_ROOT '/usr/lib64/sbcl/src'
diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu
index 4c39595..f43f587 100644
--- a/env.d/04gcc-x86_64-pc-linux-gnu
+++ b/env.d/04gcc-x86_64-pc-linux-gnu
@@ -1,6 +1,6 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4"
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
 GCC_SPECS=""
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info"
 MULTIOSDIRS="../lib64:../lib32"
diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE
index cdceeda..106fefd 120000
--- a/env.d/gcc/.NATIVE
+++ b/env.d/gcc/.NATIVE
@@ -1 +1 @@
-x86_64-pc-linux-gnu-4.8.4
\ No newline at end of file
+x86_64-pc-linux-gnu-4.8.5
\ No newline at end of file
diff --git a/env.d/gcc/config-x86_64-pc-linux-gnu b/env.d/gcc/config-x86_64-pc-linux-gnu
index a52a537..4b9db17 100644
--- a/env.d/gcc/config-x86_64-pc-linux-gnu
+++ b/env.d/gcc/config-x86_64-pc-linux-gnu
@@ -1 +1 @@
-CURRENT=x86_64-pc-linux-gnu-4.8.4
+CURRENT=x86_64-pc-linux-gnu-4.8.5
diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.8.5 b/env.d/gcc/x86_64-pc-linux-gnu-4.8.5
index 83e1524..195d1d0 100644
--- a/env.d/gcc/x86_64-pc-linux-gnu-4.8.5
+++ b/env.d/gcc/x86_64-pc-linux-gnu-4.8.5
@@ -1,6 +1,3 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
 LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5:/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5/32"
 MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man"
 INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info"
@@ -8,3 +5,4 @@ STDCXX_INCDIR="g++-v4"
 CTARGET="x86_64-pc-linux-gnu"
 GCC_SPECS=""
 MULTIOSDIRS="../lib64:../lib32"
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5"
diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
index 242ed27..da59bc5 100644
--- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
+++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
@@ -1,3 +1,5 @@
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5/32
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.5
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4/32
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.4
 /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.3/32
diff --git a/prelink.conf b/prelink.conf
index 32b7ea4..e3b0bdd 100644
--- a/prelink.conf
+++ b/prelink.conf
@@ -11,7 +11,7 @@
 -l /lib64
 -l /usr/lib64
 -h /opt/bin/
--h /usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4/
+-h /usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5/
 -h /usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3/
 -h /usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3/
 -h /opt/nvidia-cg-toolkit/bin/
diff --git a/prelink.conf.d/portage.conf b/prelink.conf.d/portage.conf
index 7e9151c..c762363 100644
--- a/prelink.conf.d/portage.conf
+++ b/prelink.conf.d/portage.conf
@@ -8,36 +8,39 @@
 -l /usr/lib64
 -l /bin
 -l /sbin
--h /lib/
--h /usr/games/lib32/
--h /usr/local/lib64/
--h /usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3/
--h /opt/nvidia-cg-toolkit/lib64/
--h /opt/bin/
--h /usr/lib/qt4/
--h /usr/local/lib32/
--h /usr/local/lib/
--h /usr/lib32/
--h /usr/lib64/qca2/
--h /usr/games/lib/
--h /usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4/
--h /usr/lib/
--h /usr/lib32/OpenCL/vendors/nvidia/
--h /opt/nvidia-cg-toolkit/bin/
--h /lib32/
--h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib/
--h /usr/lib64/
 -h /usr/lib64/OpenCL/vendors/nvidia/
--h /usr/lib32/opengl/nvidia/lib/
--h /usr/lib64/opengl/nvidia/lib/
--h /usr/lib32/qt4/
--h /usr/games/bin/
 -h /usr/lib64/qt4/
--h /lib64/
--h /usr/games/lib64/
+-h /usr/lib32/
+-h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/adalib/
+-h /usr/lib64/opengl/nvidia/lib/
 -h include ld.so.conf.d/*.conf/
--h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/
+-h /usr/lib32/OpenCL/vendors/nvidia/
+-h /usr/lib32/opengl/nvidia/lib/
+-h /opt/bin/
+-h /lib32/
+-h /usr/local/lib32/
+-h /usr/lib/
+-h /usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3/
+-h /usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5/
+-h /usr/games/lib/
 -h /usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3/
+-h /opt/aws-as-tools/bin/
+-h /usr/local/lib64/
+-h /lib/
+-h /opt/nvidia-cg-toolkit/lib32/
+-h /usr/lib32/qt4/
+-h /usr/games/lib64/
+-h /opt/nvidia-cg-toolkit/lib64/
+-h /usr/lib64/
+-h /usr/games/bin/
+-h /usr/games/lib32/
+-h /usr/lib64/gnat-gcc/x86_64-pc-linux-gnu/4.3/
+-h /opt/nvidia-cg-toolkit/bin/
+-h /usr/local/lib/
+-h /lib64/
 -b /usr/lib64/libfreebl3.so
 -b /usr/lib64/libnssdbm3.so
 -b /usr/lib64/libsoftokn3.so
+-b /usr/lib32/libfreebl3.so
+-b /usr/lib32/libnssdbm3.so
+-b /usr/lib32/libsoftokn3.so
diff --git a/profile.csh b/profile.csh
index 35344fb..d429ca6 100644
--- a/profile.csh
+++ b/profile.csh
@@ -1,9 +1,9 @@
 # Configuration file for eselect
 # This file has been automatically generated.
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin:/opt/aws-as-tools/bin'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/opt/aws-as-tools/bin'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin:/opt/aws-as-tools/bin'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/opt/aws-as-tools/bin'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 setenv CVS_RSH 'ssh'
 setenv DISTCC_LOG ''
diff --git a/profile.env b/profile.env
index 3252f3f..c7ed08e 100644
--- a/profile.env
+++ b/profile.env
@@ -1,9 +1,9 @@
 # Configuration file for eselect
 # This file has been automatically generated.
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin:/opt/aws-as-tools/bin'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.4:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/opt/aws-as-tools/bin'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/usr/games/bin:/opt/aws-as-tools/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.8.5:/usr/x86_64-pc-linux-gnu/gnat-gcc-bin/4.3:/usr/libexec/gnat-gcc/x86_64-pc-linux-gnu/4.3:/opt/nvidia-cg-toolkit/bin:/opt/aws-as-tools/bin'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/man'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.8.5/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.24/info:/usr/share/gnat-gcc-data/x86_64-pc-linux-gnu/4.3/info'
 export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/fonts/fonts.conf /etc/gconf /etc/terminfo /etc/dconf /etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/revdep-rebuild'
 export CVS_RSH='ssh'
 export DISTCC_LOG=''