diff --git a/srcpkgs/kernel-rpi/template b/srcpkgs/kernel-rpi/template
index 1cfa0498f20..6dbe799b7d6 100644
--- a/srcpkgs/kernel-rpi/template
+++ b/srcpkgs/kernel-rpi/template
@@ -69,11 +69,11 @@ do_install() {
 
 	# Switch to /usr.
 	vmkdir usr
-	vmove lib usr
+	mv ${DESTDIR}/lib ${DESTDIR}/usr
 
-	cd ${DESTDIR}/usr/lib/modules/${_kernver} && \
-		rm -f source build && \
-		ln -sf ../../../src/kernel-headers-rpi-${_kernver} build
+	cd ${DESTDIR}/usr/lib/modules/${_kernver}
+	rm -f source build
+	ln -sf ../../../src/kernel-headers-rpi-${_kernver} build
 
 	cd ${wrksrc}
 	# Install required headers to build external modules