diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index f7702e69f08..7f674f3053d 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,3 +15,4 @@ VBOX_WITH_UPDATE_REQUEST =
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
+#VBOX_GCC_WARN =
diff --git a/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch b/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch
index 71930f06271..d8531499dcc 100644
--- a/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch
+++ b/srcpkgs/virtualbox-ose/patches/change_default_driver_dir.patch
@@ -1,16 +1,16 @@
-diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-05-18 04:28:14.545495222 -0700
-+++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-05-18 04:29:57.945499707 -0700
+diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
+--- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
++++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
 @@ -36,13 +36,8 @@
  //#define DEBUG_DRI_CALLS
  
  //@todo this could be different...
 -#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri"
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
 +# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
  # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
 -#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri"
+-# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
 -# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
 -#endif
  
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 0476bb0290a..4b32568d00e 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-_vbox_distver=4.0.12
+_vbox_distver=4.1.0
 version=${_vbox_distver}
 patch_args="-Np1"
 wrksrc="VirtualBox-${version}_OSE"
@@ -10,12 +10,13 @@ short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virtualbox.org"
 license="GPL-2, MPL-1.1, CDDL"
-checksum=0175c4118af1f9633f33a055a0b0cc0b5a2d95a63b44269af2139eb2fd07e5a9
+checksum=f7bb9e0a4fe9bb406e24fa5733432534b1c8d70d6c87280875233f69bb3120de
 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."
 
 system_groups="vboxusers"
+triggers="mimedb"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="${pkgname}-dkms ${pkgname}-guest ${pkgname}-guest-dkms"
 openrc_services="virtualbox default true"
@@ -79,7 +80,7 @@ do_build()
 
 	# Build.
 	cp -f ${FILESDIR}/LocalConfig.kmk .
-	./configure --disable-kmods --disable-java --enable-vde --disable-docs
+	./configure --enable-vde --disable-java --disable-docs
 	source ./env.sh
 	kmk ${makejobs} all
 }
@@ -105,7 +106,7 @@ do_install()
 
 	# libs
 	install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox
-	install -m0644 *.gc *.r0 VBoxEFI* ${DESTDIR}/usr/lib/virtualbox
+	install -m0644 *.gc *.r0 *.fd ${DESTDIR}/usr/lib/virtualbox
 
 	# setuid
 	install -m4755 VBoxHeadless VBoxSDL VBoxNetDHCP VBoxNetAdpCtl \
@@ -128,6 +129,8 @@ do_install()
 		${DESTDIR}/usr/share/applications/virtualbox.desktop
 	sed -i -e "s|Icon=VBox|Icon=VBox.png|" \
 		${DESTDIR}/usr/share/applications/virtualbox.desktop
+	install -Dm644 virtualbox.xml \
+		${DESTDIR}/usr/share/mime/packages/virtualbox.xml
 	install -d ${DESTDIR}/usr/share/icons/hicolor
 	cp -a icons ${DESTDIR}/usr/share/icons/hicolor