diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 5b8861e..0302d38 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -113,6 +113,9 @@ Patch6045: xserver-1.6.1-pea-quirk.patch
 
 Patch6046: xserver-1.6.1-fix-glx-drawable.patch
 
+# #510238, already upstream
+Patch6047: xserver-1.6.2-vboxvideo.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -529,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 10 2009 Lubomir Rintel <lkundrak@v3.sk> 1.6.2-2
+- Add vboxvideo driver to the autodetection routine
+
 * Wed Jul 08 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6.2-1
 - xserver 1.6.2
 
diff --git a/xserver-1.6.2-vboxvideo.patch b/xserver-1.6.2-vboxvideo.patch
new file mode 100644
index 0000000..13ba373
--- /dev/null
+++ b/xserver-1.6.2-vboxvideo.patch
@@ -0,0 +1,24 @@
+From f8079585cd68ad2e742d611bdf9908dc6db5a4a9 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Fri, 10 Jul 2009 16:26:25 +0200
+Subject: [PATCH] Add vboxvideo to the autodetection routine
+
+---
+ hw/xfree86/common/xf86AutoConfig.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 056497e..14f075f 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -232,6 +232,7 @@ videoPtrToDriverList(struct pci_device *dev,
+ 	case 0x100c:		    driverList[0] = "tseng";	break;
+ 	case 0x1106:		    driverList[0] = "openchrome"; break;
+ 	case 0x15ad:		    driverList[0] = "vmware";	break;
++	case 0x80ee:		    driverList[0] = "vboxvideo"; break;
+ 	case 0x18ca:
+ 	    if (dev->device_id == 0x47)
+ 		driverList[0] = "xgixp";
+-- 
+1.6.2.5
+