diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 2cf4f4fe48..698aff9734 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -2,7 +2,7 @@
 pkgname=virtualbox-ose
 _vbox_distver=4.1.18
 version=${_vbox_distver}
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 patch_args="-Np1"
 distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
@@ -102,5 +102,5 @@ do_install() {
 		${DESTDIR}/usr/share/licenses/${pkgname}
 
 	# Install systemd unit.
-	vinstall ${FILESDIR}/virtualbox.service 644 lib/systemd/system
+	vinstall ${FILESDIR}/virtualbox.service 644 usr/lib/systemd/system
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template b/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template
index c606085719..a35af34446 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template
@@ -11,8 +11,7 @@ long_desc="${long_desc}
 dkms_modules="virtualbox-ose ${_vbox_distver}"
 noarch=yes
 
-do_install()
-{
+do_install() {
 	source ./env.sh
 
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
@@ -22,7 +21,7 @@ do_install()
 	cp -a . ${_osedir}
 	rm -f ${_osedir}/do_dkms
 	install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf
-	mkdir -p ${DESTDIR}/lib/udev/rules.d
-	install -m644 ${FILESDIR}/${sourcepkg}-dkms.udev \
-		${DESTDIR}/lib/udev/rules.d/60-virtualbox-ose-dkms.rules
+	vmkdir usr/lib/udev/rules.d
+	vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \
+		usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template
index d2767674cf..5a83c6bfd0 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template
@@ -11,9 +11,7 @@ long_desc="${long_desc}
 dkms_modules="virtualbox-ose-guest ${_vbox_distver}"
 noarch=yes
 
-do_install()
-{
-	cd ${wrksrc}
+do_install() {
 	source ./env.sh
 	
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
@@ -24,7 +22,7 @@ do_install()
 	rm -f ${_guestdir}/do_dkms
 	install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.dkms \
 		${_guestdir}/dkms.conf
-	install -d ${DESTDIR}/lib/udev/rules.d
-	install -m644 ${FILESDIR}/${sourcepkg}-guest-dkms.udev \
-		${DESTDIR}/lib/udev/rules.d/60-virtualbox-ose-guest-dkms.rules
+	vmkdir usr/lib/udev/rules.d
+	vinstall ${FILESDIR}/${sourcepkg}-guest-dkms.udev 644 \
+		usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
index 86601c0870..010f3fa16f 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
@@ -10,16 +10,15 @@ long_desc="${long_desc}
  They provide closer integration and allow to share data through shared folders
  between the host system and the virtual machine."
 
-do_install()
-{
-	cd ${wrksrc}
+do_install() {
 	source ./env.sh
 
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -d ${DESTDIR}/usr/bin ${DESTDIR}/sbin
+	vmkdir usr/bin
+	vmkdir usr/sbin
 
 	install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin
-	install -m755 mount.vboxsf ${DESTDIR}/sbin
+	install -m755 mount.vboxsf ${DESTDIR}/usr/sbin
 	install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 		${DESTDIR}/etc/xdg/autostart/vboxclient.desktop
 
@@ -33,7 +32,7 @@ do_install()
 	ln -sf /usr/lib/VBoxOGL.so \
 		${DESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -Dm755 pam_vbox.so ${DESTDIR}/lib/security/pam_vbox.so
+	install -Dm755 pam_vbox.so ${DESTDIR}/usr/lib/security/pam_vbox.so
 
-	vinstall ${FILESDIR}/virtualbox-guest.service 644 lib/systemd/system
+	vinstall ${FILESDIR}/virtualbox-guest.service 644 usr/lib/systemd/system
 }