diff --git a/tools/ChangeLog b/tools/ChangeLog
index a8eb88b3..ebe8dee8 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto,
+  catalyst-auto.conf:
+  Remove globbing support as it can't guarantee ordering
+
   04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
   Add a bit of extra verbosity
 
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index d4bd6344..43382494 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -115,7 +115,7 @@ fi
 
 cd ${SPECS_DIR}
 
-for i in $(ls -1 ${SPECS}); do
+for i in ${SPECS}; do
   cp --parents ${i} ${TMPDIR}/specs/
 done
 
@@ -139,7 +139,7 @@ if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/sna
   send_email "Catalyst build error - snapshot" "$(tail -n 200 ${TMPDIR}/log/snapshot-${DATESTAMP}.log)"
 fi
 
-for i in $(ls -1 ${SPECS}); do
+for i in ${SPECS}; do
   LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
   run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
   if [ $? != 0 ]; then
diff --git a/tools/catalyst-auto.conf b/tools/catalyst-auto.conf
index 5253e11a..3276876e 100644
--- a/tools/catalyst-auto.conf
+++ b/tools/catalyst-auto.conf
@@ -2,8 +2,10 @@
 # self-explanatory.
 
 SPECS_DIR=/release/svn-releng/trunk/releases/2008.0/specs/amd64
-SPECS="stage[123].spec installcd-stage[12]*.spec"
-SPECS="${SPECS} stage[23]-desktop.spec livecd-stage[12]*.spec"
+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"
 
 #EMAIL_TO=releng@gentoo.org
 EMAIL_TO=andrew@gentoo.org