diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 65ba56cc054..afce7ef5555 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,7 +1,7 @@
 # Template file for 'lvm2'
 pkgname=lvm2
 version=2.02.85
-revision=1
+revision=2
 wrksrc=LVM2.${version}
 distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
 build_style=gnu-configure
@@ -23,7 +23,6 @@ long_desc="
  or more physical volumes and creating one or more logical volumes
  (kind of logical partitions) in volume groups."
 
-keep_empty_dirs=yes
 subpackages="liblvm2app liblvm2app-devel device-mapper device-mapper-devel"
 conf_files="/etc/lvm/lvm.conf"
 triggers="initramfs-tools"
@@ -36,14 +35,17 @@ Add_dependency build readline-devel
 
 post_install()
 {
-	local initramfsdir=${DESTDIR}/usr/share/initramfs-tools
+	local initramfsdir=usr/share/initramfs-tools
 
-	install -d ${DESTDIR}/etc/lvm/archive ${DESTDIR}/etc/lvm/backup \
-		${DESTDIR}/etc/init.d ${initramfsdir}/scripts/local-top \
-		${initramfsdir}/hooks
-	install -m755 ${FILESDIR}/lvm2.initramfs-hook ${initramfsdir}/hooks/lvm2
-	install -m755 ${FILESDIR}/lvm2.initramfs-local-top \
-		${initramfsdir}/scripts/local-top/lvm2
+	vmkdir etc/lvm/archive
+	touch ${DESTDIR}/etc/lvm/archive/.owned
+	vmkdir etc/lvm/backup
+	touch ${DESTDIR}/etc/lvm/backup/.owned
+
+	vinstall ${FILESDIR}/lvm2.initramfs-hook 755 \
+		${initramfsdir}/hooks lvm2
+	vinstall ${FILESDIR}/lvm2.initramfs-local-top 755 \
+		${initramfsdir}/scripts/local-top lvm2
 	rm -f ${DESTDIR}/lib/*.so ${DESTDIR}/usr/lib/*.so
 	cd ${DESTDIR}/usr/lib && \
 		ln -sf $(echo ../../lib/libdevmapper.so.*) libdevmapper.so