diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
new file mode 100644
index 00000000..96d75326
--- /dev/null
+++ b/tools/catalyst-auto-arm.conf
@@ -0,0 +1,51 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+REPO_DIR=/root/releng/
+
+SPECS_DIR=${REPO_DIR}/releases/specs/arm
+
+SPECS="armv4tl/stage1.spec armv4tl/stage3.spec armv5tel/stage1.spec armv5tel/stage3.spec armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage3.spec armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage3.spec"
+
+EMAIL_SUBJECT_PREPEND="[arm-auto]"
+
+update_symlinks() {
+  # Symlink the latest stages3 to build from
+  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+    pushd $d >/dev/null
+    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 >/dev/null
+  done
+}
+
+
+upload() {
+	rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+}
+
+post_build() {
+	local set=$1 spec=$2
+
+	pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+	case ${spec} in
+	armv4tl/stage3.spec)
+		upload stage3-armv4tl-${TIMESTAMP}*.xz*
+		;;
+	armv5tel/systemd-stage3.spec)
+		upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
+		;;
+	armv6j_hardfp/stage3.spec)
+		upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+		;;
+	armv7a_hardfp/stage3.spec)
+		upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+		;;
+	esac
+
+	popd >/dev/null
+}
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
deleted file mode 100644
index e09b6cb8..00000000
--- a/tools/catalyst-auto-armv4tl.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/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=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    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 >/dev/null
-  done
-}
-
-
-post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
deleted file mode 100644
index 8daef964..00000000
--- a/tools/catalyst-auto-armv5tel.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/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=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    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 >/dev/null
-  done
-}
-
-
-post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
deleted file mode 100644
index a1d52f5d..00000000
--- a/tools/catalyst-auto-armv6j.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/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=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    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 >/dev/null
-  done
-}
-
-
-post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
deleted file mode 100644
index 50bf09f7..00000000
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/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=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    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 >/dev/null
-  done
-}
-
-
-post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
deleted file mode 100644
index a4def3c7..00000000
--- a/tools/catalyst-auto-armv7a.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/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=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    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 >/dev/null
-  done
-}
-
-
-post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
deleted file mode 100644
index ce7904a5..00000000
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/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=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    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 >/dev/null
-  done
-}
-
-
-post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}