diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index b4f9087f5ef..e8c7cb5cdb6 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -13,6 +13,7 @@ VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS)
 VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_USE_SYSTEM_XORG_HEADERS = 1
+VBOX_NO_LEGACY_XORG_X11 = 1
 # Enable it when vnc pkg is available.
 #VBOX_WITH_VNC := 1
 VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
new file mode 100644
index 00000000000..6d5dc9bdcb1
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/008-no-vboxvideo.patch
@@ -0,0 +1,11 @@
+--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2016-10-11 02:49:23.184986182 +0100
++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2016-10-11 02:49:39.879176964 +0100
+@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
+ 
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
+- DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
++ DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS))
+  SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
+  vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxvideo_drv_system_CFLAGS := \
diff --git a/srcpkgs/virtualbox-ose/patches/008-root-window.patch b/srcpkgs/virtualbox-ose/patches/008-root-window.patch
deleted file mode 100644
index af5ba1eb874..00000000000
--- a/srcpkgs/virtualbox-ose/patches/008-root-window.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/VBox/Additions/x11/vboxvideo/vboxvideo.h	2015-03-04 00:38:45.381480285 +0100
-+++ src/VBox/Additions/x11/vboxvideo/vboxvideo.h	2015-03-04 00:40:57.536942966 +0100
-@@ -130,15 +130,7 @@
- #define VBOX_MAX_DRAWABLES    256          /* At random. */
- 
- #define VBOXPTR(p) ((VBOXPtr)((p)->driverPrivate))
--
--/** Helper to work round different ways of getting the root window in different
-- * server versions. */
--#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 70000000 \
--    && XORG_VERSION_CURRENT >= 10900000
--# define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
--#else
--# define ROOT_WINDOW(pScrn) WindowTable[(pScrn)->scrnIndex]
--#endif
-+#define ROOT_WINDOW(pScrn) screenInfo.screens[(pScrn)->scrnIndex]->root
- 
- /** Structure containing all virtual monitor-specific information. */
- struct VBoxScreen
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 941a8ab503e..1d79b51d1e5 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=5.1.18
-revision=1
+revision=2
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -139,7 +139,7 @@ virtualbox-ose-dkms_package() {
 virtualbox-ose-guest_package() {
 	lib32disabled=yes
 	depends="virtualbox-ose-guest-dkms-${version}_${revision}"
-	conflicts="xserver-abi-video>20_1"
+	conflicts="xserver-abi-video>23_1"
 	short_desc+=" - guest utilities"
 
 	pkg_install() {
@@ -154,8 +154,6 @@ virtualbox-ose-guest_package() {
 			${PKGDESTDIR}/etc/xdg/autostart/vboxclient.desktop
 
 		cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-		install -D vboxvideo_drv_system.so \
-			${PKGDESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so
 		install -d ${PKGDESTDIR}/usr/lib/xorg/modules/drivers
 		install -m755 VBoxOGL*.so ${PKGDESTDIR}/usr/lib
 		ln -sf /usr/lib/VBoxOGL.so \