diff --git a/srcpkgs/dbus/INSTALL b/srcpkgs/dbus/INSTALL
index c1273a4149..84af4a8c17 100644
--- a/srcpkgs/dbus/INSTALL
+++ b/srcpkgs/dbus/INSTALL
@@ -5,6 +5,7 @@ dbus_launch=usr/libexec/dbus-daemon-launch-helper
 
 case "${ACTION}" in
 post)
+	[ ! -d var/lib/dbus ] && install -d var/lib/dbus
 	[ ! -d etc/dbus-1/session.d ] && install -d etc/dbus-1/session.d
 	chown root:dbus ${dbus_launch}
 	chmod 4750 ${dbus_launch}
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 332c6c6868..5ff5748be9 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -1,7 +1,7 @@
 # Template file for 'dbus'
 pkgname=dbus
 version=1.4.14
-revision=1
+revision=2
 homepage="http://dbus.freedesktop.org/"
 distfiles="${homepage}/releases/dbus/$pkgname-$version.tar.gz"
 build_style=gnu_configure
@@ -42,10 +42,9 @@ Add_dependency build libX11-devel
 post_install()
 {
 	# install dbus-launch.
-	install -m755 tools/dbus-launch ${DESTDIR}/usr/bin
-	install -m644 doc/dbus-launch.1 ${DESTDIR}/usr/share/man/man1
-	install -Dm755 ${FILESDIR}/30-dbus-xinit \
-		${DESTDIR}/etc/X11/xinit/xinitrc.d/30-dbus
+	vinstall tools/dbus-launch 755 usr/bin
+	vinstall doc/dbus-launch.1 644 usr/share/man/man1
+	vinstall ${FILESDIR}/30-dbus-xinit 755 etc/X11/xinit/xinitrc.d 30-dbus
 	# Install the OpenRC service
-	install -D -m755 ${FILESDIR}/dbus.rc ${DESTDIR}/etc/init.d/dbus
+	vinstall ${FILESDIR}/dbus.rc 755 etc/init.d dbus
 }