diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index 15eaf41a328..2ad19084534 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -5,7 +5,7 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-kernel
 version=3.18.5
-revision=2
+revision=3
 wrksrc="linux-${_githash}"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
@@ -49,7 +49,11 @@ do_configure() {
 	fi
 
 	# Use upstream default configuration, no need to maintain ours.
-	make ${makejobs} ${_args} ARCH=arm bcmrpi_defconfig
+	if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
+		make ${makejobs} ${_args} ARCH=arm bcm2709_defconfig
+	else
+		make ${makejobs} ${_args} ARCH=arm bcmrpi_defconfig
+	fi
 
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
 	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
@@ -80,8 +84,8 @@ do_install() {
 		./mkknlimg --dtok arch/arm/boot/zImage ${DESTDIR}/boot/kernel.img
 	fi
 	vmkdir boot/overlays
-	cp arch/arm/boot/dts/*-overlay.dtb ${DESTDIR}/boot/overlays
-	cp arch/arm/boot/dts/*.dtb ${DESTDIR}/boot
+	mv arch/arm/boot/dts/*-overlay.dtb ${DESTDIR}/boot/overlays
+	mv arch/arm/boot/dts/*.dtb ${DESTDIR}/boot
 
 	hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}