diff --git a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
index 2126aa5d9a..78ff851fda 100644
--- a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
+++ b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
@@ -5,6 +5,10 @@ long_desc="
  This package contains the required source headers to be able to build
  external 3rd party binary modules."
 
+if [ -n "${_kernel_headers_revision}" ]; then
+	revision=${_kernel_headers_revision}
+fi
+
 nostrip=yes
 noverifyrdeps=yes
 
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index d064464110..f4c3a4f74a 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -5,7 +5,7 @@
 # kernel-headers revision is set here, not on its template!
 #
 #revision=1
-#_kernel_headers_revision=1
+_kernel_headers_revision=1
 
 pkgname=kernel
 build_style=custom-install
@@ -75,7 +75,7 @@ do_install()
 	cd ${wrksrc}
 
 	# Install kernel, firmware and modules
-	make INSTALL_MOD_PATH=${DESTDIR} modules_install || return 1
+	make INSTALL_MOD_PATH=${DESTDIR} modules_install
 
 	if [ -n "${_kernel_snapshot}" -a -n "${_kernel_patch_ver}" ]; then
 		myver="${_kernel_ver}-${_kernel_patch_ver}"
@@ -105,11 +105,11 @@ do_install()
 		lver="${lver}-xen-dom0"
 	fi
 
-	install -D -m 644 .config ${DESTDIR}/boot/config-${lver} || return 1
+	install -D -m 644 .config ${DESTDIR}/boot/config-${lver}
 	install -D -m 644 arch/x86/boot/bzImage \
-		${DESTDIR}/boot/vmlinuz-${lver} || return 1
+		${DESTDIR}/boot/vmlinuz-${lver}
 	install -D -m 644 System.map \
-		${DESTDIR}/boot/System.map-${lver} || return 1
+		${DESTDIR}/boot/System.map-${lver}
 	cd ${DESTDIR}/lib/modules/${lver} && \
 		rm -f source build && \
 		ln -sf ../../../usr/src/kernel-headers-${hdrlver} build
@@ -135,9 +135,9 @@ do_install()
 		ln -sf ../generated/autoconf.h .
 
 	cd ${wrksrc}
-	mkdir -p ${hdrdest}/arch/{x86,xen}
+	mkdir -p ${hdrdest}/arch/x86
 	cp -a arch/x86/include ${hdrdest}/arch/x86
-	cp -a include/xen ${hdrdest}/arch
+	cp -a include/xen ${hdrdest}/include
 
 	# Copy files necessary for later builds, like nvidia and vmware
 	cp Module.symvers ${hdrdest}