diff --git a/tools/ChangeLog b/tools/ChangeLog
index c5e0dd3e..72be22a7 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  26 Oct 2008; Andrew Gaffney <agaffney@gentoo.org>
+  catalyst-auto-amd64.conf, +catalyst-auto-x86.conf:
+  Add x86 config and change email to releng@
+
   28 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
   Add --keep-tmpdir option Move tailing of logfile to send_email() function
 
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 4287fa7e..3fbadf6f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -9,8 +9,7 @@ SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
 
 KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64
 
-#EMAIL_TO=releng@gentoo.org
-EMAIL_TO=agaffney@gentoo.org
+EMAIL_TO=releng@gentoo.org
 EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
 EMAIL_SUBJECT_PREPEND="[amd64-auto]"
 
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
new file mode 100644
index 00000000..ae0a65d2
--- /dev/null
+++ b/tools/catalyst-auto-x86.conf
@@ -0,0 +1,20 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86
+SPECS="stage1.spec stage2.spec stage3.spec"
+SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
+#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
+#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
+
+KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86
+
+EMAIL_TO=releng@gentoo.org
+EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
+EMAIL_SUBJECT_PREPEND="[x86-auto]"
+
+CATALYST_CONFIG=/etc/catalyst/x86-auto.conf
+
+pre_build() {
+  svn up /release/svn-releng/
+}