diff --git a/tools/ChangeLog b/tools/ChangeLog
index 8add2980..a179f796 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  10 May 2009; Andrew Gaffney <agaffney@gentoo.org>
+  +catalyst-auto-amd64-hardened.conf, +catalyst-auto-x86-hardened.conf:
+  Add config files for x86/amd64 hardened
+
   09 May 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
   replace the version_stamp in livecd/volid
 
diff --git a/tools/catalyst-auto-amd64-hardened.conf b/tools/catalyst-auto-amd64-hardened.conf
new file mode 100644
index 00000000..1de3063b
--- /dev/null
+++ b/tools/catalyst-auto-amd64-hardened.conf
@@ -0,0 +1,26 @@
+# 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/amd64/hardened
+
+SPECS="stage1.spec stage2.spec stage3.spec"
+
+OPTIONAL_SPECS=""
+
+KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64
+
+EMAIL_TO=releng@gentoo.org
+EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
+EMAIL_SUBJECT_PREPEND="[amd64-hardened-auto]"
+
+CATALYST_CONFIG=/etc/catalyst/amd64-auto.conf
+
+pre_build() {
+  svn up /release/svn-releng/
+}
+
+post_build() {
+  cd /release/buildroot/amd64-dev/builds/hardened
+  mv stage3-*${DATESTAMP}*bz2* *${DATESTAMP}*.iso* /home/buildsync/builds/amd64-hardened/
+}
+
diff --git a/tools/catalyst-auto-x86-hardened.conf b/tools/catalyst-auto-x86-hardened.conf
new file mode 100644
index 00000000..5c1c21a4
--- /dev/null
+++ b/tools/catalyst-auto-x86-hardened.conf
@@ -0,0 +1,25 @@
+# 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/hardened
+
+SPECS="stage1.spec stage2.spec stage3.spec"
+
+OPTIONAL_SPECS=""
+
+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-hardened-auto]"
+
+CATALYST_CONFIG=/etc/catalyst/x86-auto.conf
+
+pre_build() {
+  svn up /release/svn-releng/
+}
+
+post_build() {
+  cd /release/buildroot/x86-dev/builds/hardened
+  mv stage3-i[46]86-*${DATESTAMP}*.bz2* *${DATESTAMP}*.iso* /home/buildsync/builds/x86-hardened/
+}