diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index fbcaff6532..954d630676 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-_localver=107		# This is the XBPS version
+_localver=108		# This is the XBPS version
 _distver=0.99		# This should match debian version
 version=${_distver}.${_localver}
 short_desc="Tools for generating an initramfs"
@@ -17,13 +17,28 @@ long_desc="
 
 noextract=yes
 noarch=yes
-keep_empty_dirs=yes
 triggers="initramfs-tools"
 conf_files="
 /etc/$pkgname/initramfs.conf
 /etc/$pkgname/update-initramfs.conf
 /etc/$pkgname/modules"
 
+make_dirs="
+/etc/$pkgname/hooks				0755	0	0
+/etc/$pkgname/conf.d				0755	0	0
+/etc/$pkgname/scripts/init-bottom		0755	0	0
+/etc/$pkgname/scripts/init-premount		0755	0	0
+/etc/$pkgname/scripts/init-top			0755	0	0
+/etc/$pkgname/scripts/local-bottom		0755	0	0
+/etc/$pkgname/scripts/local-top 		0755	0	0
+/usr/share/$pkgname/conf.d			0755	0	0
+/usr/share/$pkgname/hooksconf.d 		0755	0	0
+/usr/share/$pkgname/modules.d			0755	0	0
+/usr/share/$pkgname/scripts/init-premount	0755	0	0
+/usr/share/$pkgname/scripts/local-top		0755	0	0
+/var/lib/$pkgname				0755	0	0
+"
+
 Add_dependency full cpio
 Add_dependency full util-linux
 Add_dependency full gawk
@@ -40,66 +55,44 @@ Add_dependency full klibc-resume
 
 do_install()
 {
-	local etcdir=$DESTDIR/etc/$pkgname
-
-	# Required dirs
-	install -d $etcdir/hooks
-	install -d $etcdir/conf.d
-	install -d $etcdir/scripts/init-bottom
-	install -d $etcdir/scripts/init-premount
-	install -d $etcdir/scripts/init-top
-	install -d $etcdir/scripts/local-bottom
-	install -d $etcdir/scripts/local-premount
-	install -d $etcdir/scripts/local-top
-	install -d $DESTDIR/usr/share/$pkgname
-	install -d $DESTDIR/usr/share/$pkgname/conf.d
-	install -d $DESTDIR/usr/share/$pkgname/hooks
-	install -d $DESTDIR/usr/share/$pkgname/hooksconf.d
-	install -d $DESTDIR/usr/share/$pkgname/modules.d
-	install -d $DESTDIR/usr/share/$pkgname/scripts
-	install -d $DESTDIR/usr/share/$pkgname/scripts/init-premount
-	install -d $DESTDIR/usr/share/$pkgname/scripts/init-top
-	install -d $DESTDIR/usr/share/$pkgname/scripts/local-premount
-	install -d $DESTDIR/usr/share/$pkgname/scripts/local-top
-	install -d $DESTDIR/usr/share/doc/$pkgname
-	install -d $DESTDIR/usr/share/doc/$pkgname/examples
-	install -d $DESTDIR/usr/share/man/man5
-	install -d $DESTDIR/usr/share/man/man8
-	install -d $DESTDIR/usr/sbin
-	install -d $DESTDIR/var/lib/$pkgname
-
 	# /etc config files
-	install -m 644 $FILESDIR/conf/initramfs.conf $etcdir
-	install -m 644 $FILESDIR/conf/update-initramfs.conf $etcdir
+	vinstall $FILESDIR/conf/initramfs.conf 644 etc/$pkgname
+	vinstall $FILESDIR/conf/update-initramfs.conf 644 etc/$pkgname
 
 	# Data
-	install -m 755 $FILESDIR/init $DESTDIR/usr/share/$pkgname
+	vinstall $FILESDIR/init 744 usr/share/$pkgname
 	for f in functions local nfs; do
-		install -m 644 $FILESDIR/scripts/$f \
-			$DESTDIR/usr/share/$pkgname/scripts
+		vinstall $FILESDIR/scripts/$f 644 usr/share/$pkgname/scripts
 	done
-	install -m 755 $FILESDIR/scripts/init-top/* \
+	vmkdir usr/share/$pkgname/scripts/init-top
+	install -m755 $FILESDIR/scripts/init-top/* \
 		$DESTDIR/usr/share/$pkgname/scripts/init-top
-	install -m 755 $FILESDIR/scripts/local-premount/* \
+	vmkdir usr/share/$pkgname/scripts/local-premount
+	install -m755 $FILESDIR/scripts/local-premount/* \
 		$DESTDIR/usr/share/$pkgname/scripts/local-premount
-	install -m 755 $FILESDIR/hooks/* $DESTDIR/usr/share/$pkgname/hooks
-	install -m 644 $FILESDIR/hook-functions $DESTDIR/usr/share/$pkgname
-	install -m 644 $FILESDIR/conf/modules $etcdir
+	vmkdir usr/share/$pkgname/hooks
+	install -m755 $FILESDIR/hooks/* $DESTDIR/usr/share/$pkgname/hooks
+	install -m644 $FILESDIR/hook-functions $DESTDIR/usr/share/$pkgname
+	vinstall $FILESDIR/conf/modules 644 etc/$pkgname
 
 	# Examples
-	install -m 644 $FILESDIR/docs/* $DESTDIR/usr/share/doc/$pkgname/examples
+	vmkdir usr/share/doc/$pkgname/examples
+	install -m644 $FILESDIR/docs/* $DESTDIR/usr/share/doc/$pkgname/examples
 	
 	# Manpages
+	vmkdir usr/share/man/man5
 	install -m 644 $FILESDIR/*.5 $DESTDIR/usr/share/man/man5
+	vmkdir usr/share/man/man8
 	install -m 644 $FILESDIR/*.8 $DESTDIR/usr/share/man/man8
 
 	# Scripts
+	vmkdir usr/sbin
 	install -m 755 $FILESDIR/mkinitramfs $DESTDIR/usr/sbin
 	install -m 755 $FILESDIR/update-initramfs $DESTDIR/usr/sbin
 	sed -i -e "s|@VERSION@|${version}|g" $DESTDIR/usr/sbin/update-initramfs
 
 	# bash_completion.d
-	install -D -m644 $FILESDIR/bash_completion.d/initramfs-tools \
+	install -Dm644 $FILESDIR/bash_completion.d/initramfs-tools \
 		${DESTDIR}/etc/bash_completion.d/initramfs-tools
 
 	# Kernel hooks