diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 2c5c37a3b0e..29978c00bc9 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -1,23 +1,18 @@
 # Template file for 'kernel'
 . ${XBPS_SRCPKGDIR}/kernel/common-vars
-#
-# ATTENTION:
-# kernel-headers revision is set here, not on its template!
-#
-#revision=1
-#_kernel_headers_revision=1
 
 pkgname=kernel
 build_style=custom-install
 short_desc="The Linux kernel and modules (2.6 branch)"
 long_desc="
  This package provides the linux kernel image and associated modules."
-
 subpackages="kernel-headers"
 triggers="initramfs-tools"
 nostrip=yes
 noverifyrdeps=yes
 preserve=yes
+#revision=1
+_kernel_headers_revision=${revision}
 if [ -n "${revision}" ]; then
 	_kernver="${version}_${revision}"
 else
@@ -64,7 +59,7 @@ do_build()
 
 do_install()
 {
-	local arch myver lver hdrlver hdrdest
+	local arch lver hdrdest
 
 	if [ "$xbps_machine" != "x86_64" ]; then
 		arch=i386
@@ -76,24 +71,16 @@ do_install()
 	make INSTALL_MOD_PATH=${DESTDIR} modules_install
 
 	if [ -n "${_kernel_snapshot}" -a -n "${_kernel_patch_ver}" ]; then
-		myver="${_kernel_ver}-${_kernel_patch_ver}"
+		lver="${_kernel_ver}-${_kernel_patch_ver}"
 	else
-		myver=${version}
+		lver=${version}
 	fi
 
 	if [ -n "$revision" ]; then
-		lver="${myver}_${revision}"
-	else
-		lver="${myver}"
+		lver="${lver}_${revision}"
 	fi
 
-	if [ -n "${_kernel_headers_revision}" ]; then
-		hdrlver="${myver}_${_kernel_headers_revision}"
-	else
-		hdrlver="${myver}"
-	fi
-
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-${hdrlver}
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${lver}
 
 	install -D -m 644 .config ${DESTDIR}/boot/config-${lver}
 	install -D -m 644 arch/x86/boot/bzImage \
@@ -102,7 +89,7 @@ do_install()
 		${DESTDIR}/boot/System.map-${lver}
 	cd ${DESTDIR}/lib/modules/${lver} && \
 		rm -f source build && \
-		ln -sf ../../../usr/src/kernel-headers-${hdrlver} build
+		ln -sf ../../../usr/src/kernel-headers-${lver} build
 
 	cd ${wrksrc}
 	# Install required headers to build external modules