diff --git a/tools/ChangeLog b/tools/ChangeLog
index 53814bde..4da6a0df 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
+  Exit if snapshot creation fails
+
   04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto,
   catalyst-auto-amd64.conf:
   Enable the build functionality
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 37f89381..e0c1dd5e 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -127,6 +127,7 @@ done
 # Create snapshot
 if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/snapshot-${DATESTAMP}.log"; then
   send_email "Catalyst build error - snapshot" "$(tail -n 200 ${TMPDIR}/log/snapshot-${DATESTAMP}.log)"
+  exit 1 
 fi
 
 for i in ${SPECS}; do