diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template
index 5ff4032fe79..7a1afcc4ab0 100644
--- a/srcpkgs/os-prober/template
+++ b/srcpkgs/os-prober/template
@@ -1,7 +1,7 @@
 # Template file for 'os-prober'
 pkgname=os-prober
 version=1.58
-revision=2
+revision=4
 short_desc="Utility to detect other OSes on a set of drives"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://packages.debian.org/sid/os-prober"
@@ -14,37 +14,21 @@ do_build() {
 }
 
 do_install() {
-	local ARCH
-
-	case "${XBPS_MACHINE}" in
-		i[56]86|x86_64) ARCH=x86;;
-	esac
-
-	vmkdir usr/lib/os-probes/init
-	vmkdir usr/lib/os-probes/mounted
-	vmkdir usr/share/os-prober
-	vmkdir var/lib/os-prober
-	vmkdir usr/lib/linux-boot-probes/mounted
-	vmkdir var/lib/os-prober/mount
-	touch ${DESTDIR}/var/lib/os-prober/mount/.owned
-
-	vinstall os-prober 755 usr/bin
 	vinstall linux-boot-prober 755 usr/bin
+	vinstall os-prober 755 usr/bin
 	vinstall newns 755 usr/lib/os-prober
-	vinstall common.sh 644 usr/share/os-prober
+	vinstall common.sh 755 usr/share/os-prober
 
-	vcopy "linux-boot-probes/common/*" usr/lib/linux-boot-probes
-	vcopy "linux-boot-probes/mounted/common/*" \
-		usr/lib/linux-boot-probes/mounted
-	vcopy "linux-boot-probes/mounted/${ARCH}/*" \
-		usr/lib/linux-boot-probes/mounted
-	vcopy "os-probes/common/*" usr/lib/os-probes
-	vcopy "os-probes/init/common/*" usr/lib/os-probes/init
-	vcopy "os-probes/mounted/common/*" usr/lib/os-probes/mounted
-	vcopy "os-probes/mounted/${ARCH}/*" usr/lib/os-probes/mounted
+	for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+		vmkdir usr/lib/${dir}
+		install -m755 -t ${DESTDIR}/usr/lib/${dir} ${dir}/common/*
+		[ -d ${dir}/x86 ] && cp -r ${dir}/x86/* ${DESTDIR}/usr/lib/${dir}
+	done
+	vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted/20macosx
 }
 
 os-prober_package() {
+	make_dirs="/var/lib/os-prober root root 0755"
 	pkg_install() {
 		vmove all
 	}