diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 95c320f636..f7702e69f0 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -14,3 +14,4 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
+VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 5e4d6e778b..07cc92f22e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,13 +1,13 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-_vbox_distver=4.0.4
+_vbox_distver=4.0.6
 version=${_vbox_distver}
 wrksrc="VirtualBox-${version}_OSE"
 distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
 build_style=custom-install
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=f049fe428e2f54c6a4593283ad44680051bd582253f2863b71ed3379a77b0ac7
+checksum=8d2667f395a3c22ff4819ff51429add4f27fe667f1795821730047be127578b8
 long_desc="
  VirtualBox is a free x86 virtualization solution allowing a wide range of x86
  operating systems such as Windows, DOS, BSD or Linux to run on a Linux system."
@@ -139,57 +139,4 @@ do_install()
 	# Install the OpenRC service.
 	install -D -m755 ${FILESDIR}/virtualbox.rc \
 		${DESTDIR}/etc/init.d/virtualbox
-
-	#
-	# virtualbox-ose-dkms.
-	#
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
-	local _osedir=${DESTDIR}/usr/src/${pkgname}-${version}
-
-	mkdir -p ${_osedir}
-	cp -a . ${_osedir}
-	rm -f ${_osedir}/do_dkms
-
-	install -m644 ${FILESDIR}/${pkgname}-dkms.dkms ${_osedir}/dkms.conf
-	mkdir -p ${DESTDIR}/lib/udev/rules.d
-	install -m644 ${FILESDIR}/${pkgname}-dkms.udev \
-		${DESTDIR}/lib/udev/rules.d/60-virtualbox-ose-dkms.rules
-	#
-	# virtualbox-ose-guest.
-	#
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -d ${DESTDIR}/usr/bin ${DESTDIR}/sbin
-
-	install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin
-	install -m755 mount.vboxsf ${DESTDIR}/sbin
-	install -m644 -D ${wrksrc}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
-		${DESTDIR}/usr/share/X11/xorg.conf.d/50-vboxmouse.conf
-	install -m644 -D ${wrksrc}/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \
-		${DESTDIR}/lib/udev/rules.d/70-xorg-vboxmouse.rules
-	install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-		${DESTDIR}/etc/X11/Xsession.d/98vboxadd-xclient
-	install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-		${DESTDIR}/etc/xdg/autostart/vboxclient.desktop
-	install -D vboxmouse_drv_19.so \
-		${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so
-	install -D vboxvideo_drv_19.so \
-		${DESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so
-	install -d ${DESTDIR}/usr/lib/xorg/modules/dri
-	install -m755 VBoxOGL*.so ${DESTDIR}/usr/lib
-	cd ${DESTDIR}/usr/lib && ln -s VBoxOGL.so \
-		${DESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -m755 -D pam_vbox.so ${DESTDIR}/lib/security/pam_vbox.so
-	#
-	# virtualbox-ose-guest-dkms.
-	#
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
-	local _guestdir=${DESTDIR}/usr/src/${pkgname}-guest-${version}
-
-	cp -a . ${_guestdir}
-	rm -f ${_guestdir}/do_dkms
-	install -m644 ${FILESDIR}/${pkgname}-guest-dkms.dkms \
-		${_guestdir}/dkms.conf
-	install -m644 ${FILESDIR}/${pkgname}-guest-dkms.udev \
-		${DESTDIR}/lib/udev/rules.d/60-virtualbox-ose-guest-dkms.rules
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template b/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template
index 8a067963dc..c606085719 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-dkms.template
@@ -13,10 +13,16 @@ noarch=yes
 
 do_install()
 {
-	install -d ${DESTDIR}/lib/udev/rules.d
-	install -d ${DESTDIR}/usr/src
-	mv ${SRCPKGDESTDIR}/usr/src/virtualbox-ose-${version} \
-		${DESTDIR}/usr/src
-	mv ${SRCPKGDESTDIR}/lib/udev/rules.d/60-virtualbox-ose-dkms.rules \
-		${DESTDIR}/lib/udev/rules.d
+	source ./env.sh
+
+	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src
+	local _osedir=${DESTDIR}/usr/src/${sourcepkg}-${version}
+
+	install -d ${_osedir}
+	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
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template
index 6d4fdeac36..d2767674cf 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest-dkms.template
@@ -13,8 +13,18 @@ noarch=yes
 
 do_install()
 {
-	install -d ${DESTDIR}/usr ${DESTDIR}/lib/udev/rules.d
-	mv ${SRCPKGDESTDIR}/usr/src ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/lib/udev/rules.d/60-virtualbox-ose-guest-* \
-		${DESTDIR}/lib/udev/rules.d
+	cd ${wrksrc}
+	source ./env.sh
+	
+	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src
+	local _guestdir=${DESTDIR}/usr/src/${sourcepkg}-guest-${version}
+
+	install -d ${_guestdir}
+	cp -a . ${_guestdir}
+	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
 }
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
index a87cab363d..bc7d993613 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
@@ -24,20 +24,30 @@ Add_dependency run ${pkgname}-dkms ">=${version}"
 
 do_install()
 {
-	install -d ${DESTDIR}/usr/{bin,lib} ${DESTDIR}/{etc,lib} \
-		${DESTDIR}/lib/udev/rules.d ${DESTDIR}/usr/share/X11
-	for f in VBoxClient* VBoxControl VBoxService; do
-		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
-	done
-	mv ${SRCPKGDESTDIR}/usr/share/X11 ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/sbin ${DESTDIR}
-	mv ${SRCPKGDESTDIR}/etc/xdg ${DESTDIR}/etc
-	mv ${SRCPKGDESTDIR}/usr/lib/xorg ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/lib/udev/rules.d/70-xorg-vboxmouse.rules \
-		${DESTDIR}/lib/udev/rules.d
-	mv ${SRCPKGDESTDIR}/lib/security ${DESTDIR}/lib
-	for f in VBoxOGL VBoxOGLarrayspu VBoxOGLcrutil VBoxOGLerrorspu \
-		VBoxOGLfeedbackspu VBoxOGLpackspu VBoxOGLpassthroughspu; do
-		mv ${SRCPKGDESTDIR}/usr/lib/${f}.so ${DESTDIR}/usr/lib
-	done
+	cd ${wrksrc}
+	source ./env.sh
+
+	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
+	install -d ${DESTDIR}/usr/bin ${DESTDIR}/sbin
+
+	install -m755 VBoxClient VBoxControl VBoxService ${DESTDIR}/usr/bin
+	install -m755 mount.vboxsf ${DESTDIR}/sbin
+	install -m644 -D ${wrksrc}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \
+		${DESTDIR}/usr/share/X11/xorg.conf.d/50-vboxmouse.conf
+	install -m644 -D ${wrksrc}/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \
+		${DESTDIR}/lib/udev/rules.d/70-xorg-vboxmouse.rules
+	install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+		${DESTDIR}/etc/X11/Xsession.d/98vboxadd-xclient
+	install -m755 -D ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+		${DESTDIR}/etc/xdg/autostart/vboxclient.desktop
+	install -D vboxmouse_drv_19.so \
+		${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so
+	install -D vboxvideo_drv_19.so \
+		${DESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so
+	install -d ${DESTDIR}/usr/lib/xorg/modules/dri
+	install -m755 VBoxOGL*.so ${DESTDIR}/usr/lib
+	cd ${DESTDIR}/usr/lib && ln -s VBoxOGL.so \
+		${DESTDIR}/usr/lib/xorg/modules/dri/vboxvideo_dri.so
+	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
+	install -m755 -D pam_vbox.so ${DESTDIR}/lib/security/pam_vbox.so
 }