diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 1f0ebd66c1a..00aa8760b00 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -8,12 +8,13 @@ long_desc="
 subpackages="kernel-headers"
 triggers="kernel-hooks"
 
+build_requires=16
 nostrip=yes
 noverifyrdeps=yes
 preserve=yes
 patch_args="-Np1"
 
-revision=1
+: ${revision:=2}
 _kernel_headers_revision=${revision}
 if [ -n "${_kernel_snapshot}" ]; then
 	if [ -n "${_kernel_patch_ver}" ]; then
@@ -30,6 +31,13 @@ fi
 stow_copy_files="/lib/modules/${_kernver}/build"
 kernel_hooks_version="${_kernver}"
 
+# These files could be modified when an external module is built.
+mutable_files="
+/lib/modules/${_kernver}/modules.dep
+/lib/modules/${_kernver}/modules.dep.bin
+/lib/modules/${_kernver}/modules.symbols
+/lib/modules/${_kernver}/modules.symbols.bin"
+
 Add_dependency run glibc
 Add_dependency run initramfs-tools
 Add_dependency run linux-firmware
@@ -38,8 +46,7 @@ Add_dependency build coreutils
 Add_dependency build perl	">=0"
 Add_dependency build kmod
 
-do_configure()
-{
+do_configure() {
 	# If there's a file called <arch>-dotconfig, use it to
 	# configure the kernel; otherwise use arch defaults and all stuff
 	# as modules (defconfig+allmodconfig).
@@ -52,11 +59,11 @@ do_configure()
 	fi
 
 	if [ -f ${FILESDIR}/${arch}-dotconfig ]; then
-		msg_normal " Detected a .config file for your arch, using it.\n"
+		msg_normal "Detected a .config file for your arch, using it.\n"
 		cp -f ${FILESDIR}/${arch}-dotconfig .config
 		make ${makejobs} oldconfig
 	else
-		msg_normal " Defaulting to 'defconfig and allmodconfig'.\n"
+		msg_normal "Defaulting to 'defconfig and allmodconfig'.\n"
 		make ${makejobs} defconfig && make ${makejobs} allmodconfig
 	fi
 	if [ -n "${revision}" ]; then
@@ -64,14 +71,12 @@ do_configure()
 	fi
 }
 
-do_build()
-{
+do_build() {
 	make ${makejobs} prepare
 	make ${makejobs} bzImage modules
 }
 
-do_install()
-{
+do_install() {
 	local arch hdrdest
 
 	if [ "$XBPS_MACHINE" != "x86_64" ]; then