diff --git a/tools/ChangeLog b/tools/ChangeLog
index 3de192ed..31f08b75 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  11 May 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto-x86.conf:
+  Move x86 hardened build into normal x86 build
+
   10 May 2009; Andrew Gaffney <agaffney@gentoo.org>
   catalyst-auto-amd64-hardened.conf:
   Add in -nomultilib stage specs
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 25df4130..f670fe88 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -9,6 +9,7 @@ SPECS="stage1.spec stage2.spec stage3.spec i686/stage2.spec i686/stage3.spec"
 #SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
 
 OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="${OPTIONAL_SPECS} hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
 
 KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86
 
@@ -24,5 +25,12 @@ pre_build() {
 
 post_build() {
   cd /release/buildroot/x86-dev/builds/default
-  mv stage3-i[46]86-*${DATESTAMP}*.bz2* *${DATESTAMP}*.iso* /home/buildsync/builds/x86/
+  mv stage3-i[46]86-*${DATESTAMP}*.bz2* /home/buildsync/builds/x86/
+  if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
+    mv *${DATESTAMP}*.iso* /home/buildsync/builds/x86/
+  fi
+  cd /release/buildroot/x86-dev/builds/hardened
+  if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then
+    mv stage3-i686-*${DATESTAMP}*.bz2.* /home/buildsync/builds/x86/hardened/
+  fi
 }