diff --git a/tools/ChangeLog b/tools/ChangeLog
index 64ab1c8e..a04f2e90 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  13 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
+  Add --test flag
+
   02 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
   Process kconfig lines in a loop to handle specs with multiple kernels
 
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e4f03123..03694545 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -5,6 +5,7 @@ PID=$$
 config_file=
 verbose=0
 keep_tmpdir=0
+testing=0
 
 usage() {
   msg=$1
@@ -21,6 +22,7 @@ Options:
   -c|--config         Specifies the config file to use (required)
   --verbose           Send output of commands to console as well as log
   -k|--keep-tmpdir    Don't remove temp dir when build finishes
+  -t|--test           Stop after mangling specs and copying files
   -h|--help           Show this message and quit
 
 EOH
@@ -87,6 +89,9 @@ do
     -k|--keep-tmpdir)
       keep_tmpdir=1
       ;;
+    -t|--test)
+      testing=1
+      ;;
     -*)
       echo "You have specified an invalid option: ${a}"
       usage
@@ -171,6 +176,11 @@ for i in $(find -name '*.spec'); do
   fi
 done
 
+if [ "${testing}" -eq 1 ]; then
+  echo "Exiting due to --test"
+  exit
+fi
+
 # Create snapshot
 if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/snapshot.log"; then
   send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"