diff --git a/abs/repos/testing-i686/PKGBUILD b/abs/repos/testing-i686/PKGBUILD
new file mode 100644
index 000000000000..06bef16246da
--- /dev/null
+++ b/abs/repos/testing-i686/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
+
+pkgname=abs
+pkgver=2.4.1
+pkgrel=1
+pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
+arch=('i686' 'x86_64')
+url="http://projects.archlinux.org/abs.git/"
+license=('GPL')
+depends=('bash' 'rsync')
+backup=(etc/abs.conf)
+install=abs.install
+source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz)
+md5sums=('da6f98da566a4ac966c905ddda27de52')
+
+build() {
+  cd ${srcdir}/${pkgname}
+
+  make CONFDIR=/etc/
+  make CONFDIR=/etc/ DESTDIR=${pkgdir} install
+
+  # Add readme file, and make base /var/abs path
+  install -dm0755 ${pkgdir}/var/abs/local/
+  install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README
+
+  # make adjustments to abs.conf
+  if [[ $CARCH = "i686" ]]; then
+    sed -i 's| multilib||'  ${pkgdir}/etc/abs.conf
+  fi
+  if [[ $CARCH = "x86_64" ]]; then
+    sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf
+  fi
+}
diff --git a/abs/repos/testing-i686/abs.install b/abs/repos/testing-i686/abs.install
new file mode 100644
index 000000000000..c16a8d736349
--- /dev/null
+++ b/abs/repos/testing-i686/abs.install
@@ -0,0 +1,12 @@
+pre_upgrade() {
+    if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then
+        echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
+    
+        for dir in core extra community testing; do
+            if [ -d /var/abs/$dir ]; then
+                find /var/abs/$dir -type d -exec chown root:root {} \;
+                find /var/abs/$dir -type d -exec chmod 755 {} \;
+            fi
+        done
+    fi
+}