diff --git a/tools/ChangeLog b/tools/ChangeLog
index 4da6a0df..4b502935 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-amd64.conf:
+  Copy kconfigs and mangle path in spec
+
   04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
   Exit if snapshot creation fails
 
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e0c1dd5e..9d35f88c 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -93,15 +93,12 @@ if [ -d "${TMPDIR}" ]; then
   fi
 fi
 
-if ! mkdir -p "${TMPDIR}/specs"; then
-  echo "Couldn't create temp spec dir at ${TMPDIR}/specs!"
-  exit 1
-fi
-
-if ! mkdir -p "${TMPDIR}/log"; then
-  echo "Couldn't create log dir at ${TMPDIR}/log!"
-  exit 1
-fi
+for i in ${TMPDIR} ${TMPDIR}/specs ${TMPDIR}/kconfig ${TMPDIR}/log; do
+  if ! mkdir -p "${i}"; then
+    echo "Couldn't create dir ${i}!"
+    exit 1
+  fi
+done
 
 cd ${SPECS_DIR}
 
@@ -109,6 +106,9 @@ for i in ${SPECS}; do
   cp --parents ${i} ${TMPDIR}/specs/
 done
 
+cd ${KCONFIG_DIR}
+find -type f -exec cp {} ${TMPDIR}/kconfig \;
+
 cd ${TMPDIR}/specs
 
 # Fix up specs with datestamp
@@ -122,6 +122,13 @@ for i in $(find -name '*.spec'); do
   if [ "${old_version_stamp}" = "${old_source_subpath}" ]; then
     sed -i 's|^source_subpath: \(.\+-\).\+$|source_subpath: \1'${DATESTAMP}'|' ${i}
   fi
+
+  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}
+  fi
 done
 
 # Create snapshot
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 7a8bd239..bfbde973 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -7,6 +7,8 @@ SPECS="stage1.spec stage2.spec stage3.spec"
 #SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
 #SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
 
+KCONFIG_DIR=/release/svn-releng/trunk/releases/2008.0/kconfig/amd64
+
 #EMAIL_TO=releng@gentoo.org
 EMAIL_TO=agaffney@gentoo.org
 EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org