diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index b1acb3f32d0..caf077dc5c1 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -28,11 +28,11 @@ Add_dependency run initramfs-tools
 Add_dependency run kernel-firmware ">=${_kernel_ver}"
 Add_dependency build perl
 
-do_install()
+do_build()
 {
 	# If there's a file called kernel-<arch>-dotconfig, use it to
 	# configure the kernel; otherwise run the menuconfig target.
-	local arch lver mjobs hdrdest
+	local arch mjobs
 
 	if [ "$XBPS_MAKEJOBS" -gt 1 ]; then
 		mjobs="-j $XBPS_MAKEJOBS"
@@ -58,12 +58,25 @@ do_install()
 			${wrksrc}/.config
 	fi
 	# Build
-	make ${mjobs} prepare
+	make ${mjobs} prepare || return 1
 	make ${mjobs} bzImage modules || return 1
+}
+
+do_install()
+{
+	local arch lver hdrdest
+
+	if [ "$xbps_machine" != "x86_64" ]; then
+		arch=i386
+	else
+		arch=x86_64
+	fi
+
+	cd ${wrksrc} || return 1
 
 	# Install kernel, firmware and modules
 	install -d ${DESTDIR}/lib ${DESTDIR}/boot
-	make ${mjobs} INSTALL_MOD_PATH=${DESTDIR} modules_install || return 1
+	make INSTALL_MOD_PATH=${DESTDIR} modules_install || return 1
 	if [ -n "$revision" ]; then
 		lver="${version}_${revision}"
 	else