diff --git a/releases/weekly/specs/arm/armeb/stage1.spec b/releases/weekly/specs/arm/armeb/stage1.spec
index 80715889..633d03f5 100644
--- a/releases/weekly/specs/arm/armeb/stage1.spec
+++ b/releases/weekly/specs/arm/armeb/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-armeb-2008.0
+source_subpath: default/stage3-armeb-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv4l/stage1.spec b/releases/weekly/specs/arm/armv4l/stage1.spec
index 9e135473..3313986c 100644
--- a/releases/weekly/specs/arm/armv4l/stage1.spec
+++ b/releases/weekly/specs/arm/armv4l/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-armv4l-2008.0
+source_subpath: default/stage3-armv4l-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv4tl/stage1.spec b/releases/weekly/specs/arm/armv4tl/stage1.spec
index e5aa79b3..fd349b8a 100644
--- a/releases/weekly/specs/arm/armv4tl/stage1.spec
+++ b/releases/weekly/specs/arm/armv4tl/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0/armv4t
 snapshot: 2008.0
-source_subpath: default/stage3-armv4tl-2008.0
+source_subpath: default/stage3-armv4tl-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv5teb/stage1.spec b/releases/weekly/specs/arm/armv5teb/stage1.spec
index e7a75456..e95549f9 100644
--- a/releases/weekly/specs/arm/armv5teb/stage1.spec
+++ b/releases/weekly/specs/arm/armv5teb/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-armv5teb-2008.0
+source_subpath: default/stage3-armv5teb-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv5tejl/stage1.spec b/releases/weekly/specs/arm/armv5tejl/stage1.spec
index 76d9496c..bab07c33 100644
--- a/releases/weekly/specs/arm/armv5tejl/stage1.spec
+++ b/releases/weekly/specs/arm/armv5tejl/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-armv5tejl-2008.0
+source_subpath: default/stage3-armv5tejl-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv5tel/stage1.spec b/releases/weekly/specs/arm/armv5tel/stage1.spec
index 9dc3f6fe..9e1fd882 100644
--- a/releases/weekly/specs/arm/armv5tel/stage1.spec
+++ b/releases/weekly/specs/arm/armv5tel/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0/armv5te
 snapshot: 2008.0
-source_subpath: default/stage3-armv5tel-2008.0
+source_subpath: default/stage3-armv5tel-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv5tl/stage1.spec b/releases/weekly/specs/arm/armv5tl/stage1.spec
index 73c2911f..d65db65f 100644
--- a/releases/weekly/specs/arm/armv5tl/stage1.spec
+++ b/releases/weekly/specs/arm/armv5tl/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-armv5tl-2008.0
+source_subpath: default/stage3-armv5tl-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec b/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec
index 59efdd17..07dd2a33 100644
--- a/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec
+++ b/releases/weekly/specs/arm/armv6j/hardfloat/stage1.spec
@@ -4,6 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0/armv6j
 snapshot: 2008.0
-source_subpath: default/stage3-armv6j_hardfp-2008.0
-
+source_subpath: default/stage3-armv6j_hardfp-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv6j/stage1.spec b/releases/weekly/specs/arm/armv6j/stage1.spec
index 5dc720d2..5d98e3eb 100644
--- a/releases/weekly/specs/arm/armv6j/stage1.spec
+++ b/releases/weekly/specs/arm/armv6j/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0/armv6j
 snapshot: 2008.0
-source_subpath: default/stage3-armv6j-2008.0
+source_subpath: default/stage3-armv6j-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec b/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec
index 1677290c..5461288c 100644
--- a/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec
+++ b/releases/weekly/specs/arm/armv7a/hardfloat/stage1.spec
@@ -4,6 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0/armv7a
 snapshot: 2008.0
-source_subpath: default/stage3-armv7a_hardfp-2008.0
-
+source_subpath: default/stage3-armv7a_hardfp-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/armv7a/stage1.spec b/releases/weekly/specs/arm/armv7a/stage1.spec
index dc0a3599..f99c28ec 100644
--- a/releases/weekly/specs/arm/armv7a/stage1.spec
+++ b/releases/weekly/specs/arm/armv7a/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0/armv7a
 snapshot: 2008.0
-source_subpath: default/stage3-armv7a-2008.0
+source_subpath: default/stage3-armv7a-latest
 update_seed: yes
diff --git a/releases/weekly/specs/arm/stage1.spec b/releases/weekly/specs/arm/stage1.spec
index 65fe1ee9..f3bc6844 100644
--- a/releases/weekly/specs/arm/stage1.spec
+++ b/releases/weekly/specs/arm/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/arm/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-arm-2008.0
+source_subpath: default/stage3-arm-latest
 update_seed: yes
diff --git a/releases/weekly/specs/ia64/stage3.spec b/releases/weekly/specs/ia64/stage3.spec
index 25cdc4fb..abc463ff 100644
--- a/releases/weekly/specs/ia64/stage3.spec
+++ b/releases/weekly/specs/ia64/stage3.spec
@@ -4,4 +4,4 @@ target: stage3
 rel_type: default
 profile: default/linux/ia64/13.0
 snapshot: 2008.0
-source_subpath: default/stage2-ia64-latest
+source_subpath: default/stage2-ia64-2008.0
diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec b/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec
index 7be7e3a5..ad9e2cae 100644
--- a/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec
+++ b/releases/weekly/specs/sparc/sparc64/multilib/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: multilib
 profile: default/linux/sparc/experimental/multilib
 snapshot: 2008.0
-source_subpath: multilib/stage3-sparc64-multilib-2008.0
+source_subpath: multilib/stage3-sparc64-multilib-latest
 update_seed: yes
diff --git a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec b/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
index fd016e1a..db38dbd1 100644
--- a/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
+++ b/releases/weekly/specs/sparc/sparc64/multilib/stage3.spec
@@ -4,4 +4,4 @@ target: stage3
 rel_type: multilib
 profile: default/linux/sparc/experimental/multilib
 snapshot: 2008.0
-source_subpath: multilib/stage2-sparc64-multilib-latest
+source_subpath: multilib/stage2-sparc64-multilib-2008.0
diff --git a/releases/weekly/specs/sparc/sparc64/stage1.spec b/releases/weekly/specs/sparc/sparc64/stage1.spec
index 5cc7ecdc..81dfe1af 100644
--- a/releases/weekly/specs/sparc/sparc64/stage1.spec
+++ b/releases/weekly/specs/sparc/sparc64/stage1.spec
@@ -4,5 +4,5 @@ target: stage1
 rel_type: default
 profile: default/linux/sparc/13.0
 snapshot: 2008.0
-source_subpath: default/stage3-sparc64-2008.0
+source_subpath: default/stage3-sparc64-latest
 update_seed: yes
diff --git a/releases/weekly/specs/sparc/sparc64/stage3.spec b/releases/weekly/specs/sparc/sparc64/stage3.spec
index 5403a17d..febd32ac 100644
--- a/releases/weekly/specs/sparc/sparc64/stage3.spec
+++ b/releases/weekly/specs/sparc/sparc64/stage3.spec
@@ -4,4 +4,4 @@ target: stage3
 rel_type: default
 profile: default/linux/sparc/13.0
 snapshot: 2008.0
-source_subpath: default/stage2-sparc64-latest
+source_subpath: default/stage2-sparc64-2008.0
diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 4375a3da..39f7e193 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -75,11 +75,12 @@ for ARCH in $ARCHES; do
 	fi
 	if [ -n "${stage3_list}" ]; then
 		echo -e "${header}" >"${OUT_STAGE3}"
-		echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3}
+		# In the new variant preserve code there is a better way to do this
+		#echo -e "${stage3_list}" |awk '{print $3}' |grep "$latest_stage3_date" >>${OUT_STAGE3}
 		rm -f current-stage3
-		# The "latest stage3" concept doesn't apply to the arm variants
+		# The "latest stage3" concept doesn't apply to the arm/hppa/s390/sh variants
 		# that are pushed on different days of the week.
-		if [[ ! $(echo ${outdir} | grep arm) ]]; then
+		if [[ ! $(echo ${outdir} | egrep 'arm|hppa|ppc|s390|sh') ]]; then
 			ln -sf "$latest_stage3_date" current-stage3
 		fi
 	fi
@@ -88,11 +89,11 @@ for ARCH in $ARCHES; do
 	variants="$(find 20* \( -iname '*.iso' -o -iname '*.tar.bz2' \) -printf '%f\n' |sed  -e 's,-20[012][0-9]\{5\}.*,,g' -r | sort | uniq)"
 	echo -n '' >"${tmpdir}"/.keep.${ARCH}.txt
 	for v in $variants ; do
-		#date_variant=$(find 20* -iname "${v}*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -printf '%h\n' | sed -e "s,.*/$a/autobuilds/,,g" -e 's,/.*,,g' |sort -n | tail -n1 )
-		variant_path=$(find 20* -iname "${v}-*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -print | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 )
+		variant_path=$(find 20* -iname "${v}-20*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -print | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 )
 		f="latest-${v}.txt"
 		echo -e "${header}" >"${f}"
 		echo -e "${variant_path}" >>${f}
+		echo -e "${variant_path}" >>${OUT_STAGE3}
 		rm -f "current-$v"
 		ln -sf "${variant_path%/*}" "current-$v"
 		echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 's,$,$,g' >>"${tmpdir}"/.keep.${ARCH}.txt
diff --git a/tools-uclibc/desktop/portage/make.conf.1 b/tools-uclibc/desktop/portage/make.conf.1
index 597e28e4..11af927f 100644
--- a/tools-uclibc/desktop/portage/make.conf.1
+++ b/tools-uclibc/desktop/portage/make.conf.1
@@ -9,5 +9,5 @@ USE="${USE_BASE} ${USE_GCC}"
 
 source "/var/lib/layman/make.conf"
 
-SYNC="rsync://192.168.3.1/portage"
-GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo"
+SYNC="rsync://67.151.215.244/portage"
+GENTOO_MIRRORS="ftp://67.151.215.244/pub/gentoo"
diff --git a/tools-uclibc/desktop/portage/make.conf.2 b/tools-uclibc/desktop/portage/make.conf.2
index 1aceee5b..0c0c43b6 100644
--- a/tools-uclibc/desktop/portage/make.conf.2
+++ b/tools-uclibc/desktop/portage/make.conf.2
@@ -36,9 +36,9 @@ USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LA
 XFCE_PLUGINS="trash menu logout"
 INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount tslib void"
 VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
-LINGUAS="en"
+LINGUAS="af af_ZA ak am ar ar_SA ar_SY as as_IN ast az be be_BY bg bg_BG bn bn_BD bn_IN bo br brx bs ca ca_ES ca_XV ca@valencia crh cs cs_CZ csb cy da de de_DE de_FR dgo dz ee el el_GR en en_CA en_GB en_US en_ZA eo es es_AR es_CL es_CO es_CR es_ES es_LA es_MX es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gl gu gu_IN he he_IL hi hi_IN hne hr hsb ht hu hu_HU hy hy_AM ia id id_ID is it it_IT ja ja_JP jv ka ka_GE kk km kn kn_IN ko ko_KR kok ks ku ky la lb lg lo lt lt_LT lv lv_LV mai me mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nr ns nso oc om or or_IN pa pa_IN pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU rw sa_IN sat sco sd se sh sh_YU son si si_LK sk sk_SK sl sl_SI sq sr sr@ijekavian sr@ijekavianlatin sr@latin sr@Latn sr_BA sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tk tl tn tr ts tt ug uk uk_UA ur ur_IN ur_PK uz uz@cyrillic ve vi vi_VN wa xh yi zh zh_CN zh_HK zh_TW zu"
 
 source "/var/lib/layman/make.conf"
 
-SYNC="rsync://192.168.3.1/portage"
-GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo"
+SYNC="rsync://67.151.215.244/portage"
+GENTOO_MIRRORS="ftp://67.151.215.244/pub/gentoo"
diff --git a/tools-uclibc/desktop/portage/make.conf.3 b/tools-uclibc/desktop/portage/make.conf.3
index 5d907b14..8e16fb84 100644
--- a/tools-uclibc/desktop/portage/make.conf.3
+++ b/tools-uclibc/desktop/portage/make.conf.3
@@ -36,9 +36,9 @@ USE="${USE_BASE} ${USE_GCC} ${USE_ENC} ${USE_ACL} ${USE_DBS} ${USE_CMP} ${USE_LA
 XFCE_PLUGINS="trash menu logout"
 INPUT_DEVICES="acecad aiptek elographics evdev fpit hyperpen joystick keyboard mouse mutouch penmount synaptics tslib void wacom"
 VIDEO_CARDS="apm ark ast chips cirrus epson fbdev glint i128 i740 intel mach64 mga modesetting nouveau nv r128 radeon rendition s3 s3virge savage siliconmotion sis sisusb tdfx tga trident tseng v4l vesa"
-LINGUAS="en"
+LINGUAS="af af_ZA ak am ar ar_SA ar_SY as as_IN ast az be be_BY bg bg_BG bn bn_BD bn_IN bo br brx bs ca ca_ES ca_XV ca@valencia crh cs cs_CZ csb cy da de de_DE de_FR dgo dz ee el el_GR en en_CA en_GB en_US en_ZA eo es es_AR es_CL es_CO es_CR es_ES es_LA es_MX es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gl gu gu_IN he he_IL hi hi_IN hne hr hsb ht hu hu_HU hy hy_AM ia id id_ID is it it_IT ja ja_JP jv ka ka_GE kk km kn kn_IN ko ko_KR kok ks ku ky la lb lg lo lt lt_LT lv lv_LV mai me mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nr ns nso oc om or or_IN pa pa_IN pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU rw sa_IN sat sco sd se sh sh_YU son si si_LK sk sk_SK sl sl_SI sq sr sr@ijekavian sr@ijekavianlatin sr@latin sr@Latn sr_BA sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tk tl tn tr ts tt ug uk uk_UA ur ur_IN ur_PK uz uz@cyrillic ve vi vi_VN wa xh yi zh zh_CN zh_HK zh_TW zu"
 
 source "/var/lib/layman/make.conf"
 
-SYNC="rsync://192.168.3.1/portage"
-GENTOO_MIRRORS="ftp://192.168.3.1/pub/gentoo"
+SYNC="rsync://67.151.215.244/portage"
+GENTOO_MIRRORS="ftp://67.151.215.244/pub/gentoo"
diff --git a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox b/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox
deleted file mode 100644
index b94948b3..00000000
--- a/tools-uclibc/portage.armv7a.hardened/package.accept_keywords/sandbox
+++ /dev/null
@@ -1 +0,0 @@
-=sys-apps/sandbox-2.6 ~arm
diff --git a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox b/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox
deleted file mode 100644
index b94948b3..00000000
--- a/tools-uclibc/portage.armv7a.vanilla/package.accept_keywords/sandbox
+++ /dev/null
@@ -1 +0,0 @@
-=sys-apps/sandbox-2.6 ~arm
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
new file mode 100644
index 00000000..70e4d074
--- /dev/null
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -0,0 +1,55 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv4tl
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+
+SETS="default"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
+
+EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
+EMAIL_FROM=catalyst@replaceme.local
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+  sed 's,-20,~20,g' | \
+  sort -k +1 -n -t '~' |\
+  awk -F\~ \
+  'BEGIN{i=$1; o=$0};
+  { if($1 != i && i != "") { print o; }; i=$1; o=$0;  }
+  END { print o; };' | \
+  tr '~' '-'
+}
+
+
+pre_build() {
+  cd ${GITDIR}
+  git pull
+
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d
+    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+      ln -sf $f $of
+    done
+    popd
+  done
+}
+
+
+post_build() {
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
new file mode 100644
index 00000000..dda8e170
--- /dev/null
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -0,0 +1,55 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv5tel
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+
+SETS="default"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
+
+EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
+EMAIL_FROM=catalyst@replaceme.local
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+  sed 's,-20,~20,g' | \
+  sort -k +1 -n -t '~' |\
+  awk -F\~ \
+  'BEGIN{i=$1; o=$0};
+  { if($1 != i && i != "") { print o; }; i=$1; o=$0;  }
+  END { print o; };' | \
+  tr '~' '-'
+}
+
+
+pre_build() {
+  cd ${GITDIR}
+  git pull
+
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d
+    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+      ln -sf $f $of
+    done
+    popd
+  done
+}
+
+
+post_build() {
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
new file mode 100644
index 00000000..12e21d63
--- /dev/null
+++ b/tools/catalyst-auto-armv6j.conf
@@ -0,0 +1,55 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+
+SETS="default"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
+
+EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
+EMAIL_FROM=catalyst@replaceme.local
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+  sed 's,-20,~20,g' | \
+  sort -k +1 -n -t '~' |\
+  awk -F\~ \
+  'BEGIN{i=$1; o=$0};
+  { if($1 != i && i != "") { print o; }; i=$1; o=$0;  }
+  END { print o; };' | \
+  tr '~' '-'
+}
+
+
+pre_build() {
+  cd ${GITDIR}
+  git pull
+
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d
+    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+      ln -sf $f $of
+    done
+    popd
+  done
+}
+
+
+post_build() {
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
new file mode 100644
index 00000000..989546e9
--- /dev/null
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -0,0 +1,55 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j/hardfloat
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+
+SETS="default"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
+
+EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
+EMAIL_FROM=catalyst@replaceme.local
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+  sed 's,-20,~20,g' | \
+  sort -k +1 -n -t '~' |\
+  awk -F\~ \
+  'BEGIN{i=$1; o=$0};
+  { if($1 != i && i != "") { print o; }; i=$1; o=$0;  }
+  END { print o; };' | \
+  tr '~' '-'
+}
+
+
+pre_build() {
+  cd ${GITDIR}
+  git pull
+
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d
+    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+      ln -sf $f $of
+    done
+    popd
+  done
+}
+
+
+post_build() {
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
new file mode 100644
index 00000000..e9fd62f5
--- /dev/null
+++ b/tools/catalyst-auto-armv7a.conf
@@ -0,0 +1,55 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+
+SETS="default"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
+
+EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
+EMAIL_FROM=catalyst@replaceme.local
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+  sed 's,-20,~20,g' | \
+  sort -k +1 -n -t '~' |\
+  awk -F\~ \
+  'BEGIN{i=$1; o=$0};
+  { if($1 != i && i != "") { print o; }; i=$1; o=$0;  }
+  END { print o; };' | \
+  tr '~' '-'
+}
+
+
+pre_build() {
+  cd ${GITDIR}
+  git pull
+
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d
+    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+      ln -sf $f $of
+    done
+    popd
+  done
+}
+
+
+post_build() {
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
new file mode 100644
index 00000000..7c31debf
--- /dev/null
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -0,0 +1,55 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a/hardfloat
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+
+SETS="default"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
+
+EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
+EMAIL_FROM=catalyst@replaceme.local
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
+BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
+
+give_latest_from_dates() {
+  sed 's,-20,~20,g' | \
+  sort -k +1 -n -t '~' |\
+  awk -F\~ \
+  'BEGIN{i=$1; o=$0};
+  { if($1 != i && i != "") { print o; }; i=$1; o=$0;  }
+  END { print o; };' | \
+  tr '~' '-'
+}
+
+
+pre_build() {
+  cd ${GITDIR}
+  git pull
+
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d
+    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+      ln -sf $f $of
+    done
+    popd
+  done
+}
+
+
+post_build() {
+  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b9d4081d..f31cc6e6 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -38,7 +38,7 @@ pre_build() {
   git pull
 
   # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
     pushd $d
     for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a0c2d0c1..620a7059 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -44,7 +44,6 @@ pre_build() {
         of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
         ln -sf $f $of
       done
-    done
     popd
   done
 }