diff --git a/default-package-config.sh b/default-package-config.sh
index 6b9de14..23b5b8b 100644
--- a/default-package-config.sh
+++ b/default-package-config.sh
@@ -37,8 +37,9 @@ function merge_with_upstream() {
 #
 function kernel_prepare() {
 	logmust install_pkgs \
-		equivs \
 		devscripts \
+		equivs \
+		gawk \
 		kernel-wedge
 }
 
diff --git a/lib/common.sh b/lib/common.sh
index 9d1d69c..29ae0ca 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -594,6 +594,20 @@ function install_kernel_headers() {
 	for kernel in $KERNEL_VERSIONS; do
 		logmust dpkg-query -l "linux-headers-$kernel" >/dev/null
 	done
+
+	#
+	# XXX: Refactor & explain
+	#
+	logmust echo "SERAPHEIM START2"
+	local pkg
+	for pkg in "${_RET_LIST[@]}"; do
+		logmust install_pkgs "$DEPDIR/$pkg/"linux-image-*-dbgsym.deb
+	done
+	local kernel
+	for kernel in $KERNEL_VERSIONS; do
+		logmust cp "/usr/lib/debug/boot/vmlinux-${kernel}" "/usr/src/linux-headers-$kernel/vmlinux"
+	done
+	logmust echo "SERAPHEIM END2"
 }
 
 function delphix_revision() {