diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index f8646a065d4..3c5d97830ee 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -2,7 +2,7 @@
 pkgname=virtualbox-ose
 _vbox_distver=4.2.12
 version=${_vbox_distver}
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 patch_args="-Np1"
 short_desc="General-purpose full virtualizer for x86 hardware"
@@ -12,7 +12,7 @@ license="GPL-2, MPL-1.1, CDDL"
 distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
 checksum=eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6
 
-makedepends="which pkg-config openssl-devel libcurl-devel libpng-devel>=1.5.10
+makedepends="which pkg-config openssl-devel libcurl-devel libpng-devel>=1.6
  alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
  libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
  pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel
@@ -103,7 +103,7 @@ do_install() {
 }
 
 virtualbox-ose-dkms_package() {
-	short_desc="${short_desc} - kernel module sources for dkms"
+	short_desc+=" - kernel module sources for dkms"
 	dkms_modules="virtualbox-ose ${_vbox_distver}"
 	depends="dkms"
 	noarch=yes
@@ -126,7 +126,7 @@ virtualbox-ose-dkms_package() {
 virtualbox-ose-guest_package() {
 	systemd_services="vboxservice.service on"
 	depends="virtualbox-ose-guest-dkms-${version}_${revision}"
-	short_desc="${short_desc} - guest utilities"
+	short_desc+=" - guest utilities"
 
 	pkg_install() {
 		source ${wrksrc}/env.sh
@@ -157,7 +157,7 @@ virtualbox-ose-guest_package() {
 }
 
 virtualbox-ose-guest-dkms_package() {
-	short_desc="${short_desc} - guest addition module source for dkms"
+	short_desc+=" - guest addition module source for dkms"
 	dkms_modules="virtualbox-ose-guest ${_vbox_distver}"
 	depends="dkms"
 	noarch=yes
@@ -183,7 +183,6 @@ virtualbox-ose_package() {
 		hicolor-icon-theme desktop-file-utils shadow"
 	system_groups="vboxusers"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }