diff --git a/tools/ChangeLog b/tools/ChangeLog
index 29ccfb22..64ab1c8e 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  02 Mar 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
+  Process kconfig lines in a loop to handle specs with multiple kernels
+
   23 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto-x86.conf:
   Only sync stage3 tarballs and s/x86/i486/
 
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 0e86be19..e4f03123 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -163,9 +163,11 @@ for i in $(find -name '*.spec'); do
 
   kconfig_line=$(grep '^boot/kernel/[^/]\+/config:' ${i})
   if [ -n "${kconfig_line}" ]; then
-    key=$(echo "${kconfig_line}" | cut -d: -f1)
-    filename=$(basename $(echo "${kconfig_line}" | cut -d: -f2))
-    sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" ${i}
+    echo "${kconfig_file}" | while read line; do
+      key=$(echo "${line}" | cut -d: -f1)
+      filename=$(basename $(echo "${line}" | cut -d: -f2))
+      sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" ${i}
+    done
   fi
 done