diff --git a/x11-misc/mkxf86config/Manifest b/x11-misc/mkxf86config/Manifest
index 93629c602..58cd26d67 100644
--- a/x11-misc/mkxf86config/Manifest
+++ b/x11-misc/mkxf86config/Manifest
@@ -1,4 +1,4 @@
-AUX mkxf86config-0.9.10.patch 11891 RMD160 8354c341e2f6fea9d4f90babda1158a703c7b77d SHA1 4a71418865a6cc9fc6f3333d931df980a91b40bb SHA256 d47a349444fbfb8f68014b9a391335ded2a41e3869fb3989a75c11eb8c0574b7
+AUX mkxf86config-0.9.10.patch 12186 RMD160 b0a17e9f23db6fb4b729bd5c4635e84c4e776fe4 SHA1 0b14126cda4acceb928484867aaac9dd25502dba SHA256 f128667372ade064294958e78abbc2107dbad4e760a04fd586af035644b27bc3
 AUX mkxf86config.initd 145 RMD160 0246c54a139e3cbd72e53774d539e9c6beece255 SHA1 50588bf1ad9faf7ddd9d4134b52a9480be3c9a5b SHA256 471e7800547c76faae8c96b8e84343e67ea763db3eeab0850edb7675e231ff51
 DIST mkxf86config-0.9.10.tar.bz2 6461 RMD160 28512dede6a8887c7cbdb31b83a2ffce082cc1db SHA1 3e9a16447f8f9b5994a34fee7de05285202efd97 SHA256 82c9c66081588865e719942092fb69233f72fdb423eb285b3775123b2de45829
-EBUILD mkxf86config-0.9.10-r9.ebuild 1047 RMD160 834e7e92a6abec7ded68e1aa22fac86dcfd8bb2a SHA1 c059c868aab6d219c7ba2e8499533c543fbf80e4 SHA256 2a27ade21a149cb57b17251baaab17f638641aa827b5885187368ae77f931932
+EBUILD mkxf86config-0.9.10-r10.ebuild 1047 RMD160 834e7e92a6abec7ded68e1aa22fac86dcfd8bb2a SHA1 c059c868aab6d219c7ba2e8499533c543fbf80e4 SHA256 2a27ade21a149cb57b17251baaab17f638641aa827b5885187368ae77f931932
diff --git a/x11-misc/mkxf86config/files/mkxf86config-0.9.10.patch b/x11-misc/mkxf86config/files/mkxf86config-0.9.10.patch
index 335b3760e..59cefaf4b 100644
--- a/x11-misc/mkxf86config/files/mkxf86config-0.9.10.patch
+++ b/x11-misc/mkxf86config/files/mkxf86config-0.9.10.patch
@@ -1,6 +1,6 @@
 diff -Naur mkxf86config-0.9.10.orig/aticards mkxf86config-0.9.10/aticards
 --- mkxf86config-0.9.10.orig/aticards	1970-01-01 01:00:00.000000000 +0100
-+++ mkxf86config-0.9.10/aticards	2009-06-15 23:39:06.000000000 +0200
++++ mkxf86config-0.9.10/aticards	2009-11-27 19:23:07.000000000 +0100
 @@ -0,0 +1,31 @@
 +Radeon.*HD.*2350
 +Radeon.*HD.*2300
@@ -35,7 +35,7 @@ diff -Naur mkxf86config-0.9.10.orig/aticards mkxf86config-0.9.10/aticards
 +RV670
 diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86config.sh
 --- mkxf86config-0.9.10.orig/mkxf86config.sh	2008-04-10 05:27:36.000000000 +0200
-+++ mkxf86config-0.9.10/mkxf86config.sh	2009-06-15 23:39:06.000000000 +0200
++++ mkxf86config-0.9.10/mkxf86config.sh	2009-11-27 19:28:27.000000000 +0100
 @@ -53,6 +53,7 @@
  			# We got a resolution on the command line, use it.
  			NEWMODE=$(echo ${x} | cut -d= -f2)
@@ -155,16 +155,21 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
  fi
  
  # Write Monitor data now
-@@ -212,6 +286,8 @@
+@@ -210,8 +284,12 @@
+ 	if [ -e /usr/lib/xorg/modules/input/vmmouse_drv.so ] || \
+ 	[ -e /usr/lib/modules/input/vmmouse_drv.so ]
  	then
- 		MOUSEDRIVER='s|^.*Driver.*"mouse".*$|\tDriver\t"vmmouse"|g;'
+-		MOUSEDRIVER='s|^.*Driver.*"mouse".*$|\tDriver\t"vmmouse"|g;'
++		# MOUSEDRIVER='s|^.*Driver.*"mouse".*$|\tDriver\t"vmmouse"|g;'
++		ewarn "Using the vmmouse driver as there are some issues"
++		ewarn "See http://communities.vmware.com/message/716756"
  	fi
 +	PSMOUSE='s|^.*InputDevice.*"PS/2 Mouse".*$|# PS/2 Mouse using /dev/input/mice in Kernel 2.6|g;'
 +	MODES="Modes \"1024x768\" \"800x600\" \"640x480\""
  fi
  
  #VirtualPC special handline
-@@ -220,6 +296,17 @@
+@@ -220,6 +298,17 @@
  then
  	VPC='s|^.*BusID.*PCI.*$|BusID "PCI:0:8:0"|g;'
  	DEPTH='s|DefaultColorDepth 24|DefaultColorDepth 16|g;'
@@ -182,7 +187,7 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
  fi
  
  # If we don't have a XMODULE set, use fbdev as fall-back
-@@ -235,10 +322,10 @@
+@@ -235,10 +324,10 @@
  SWCURSOR=""
  MONITORLAYOUT=""
  case "${XMODULE}" in
@@ -195,7 +200,7 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
  		SWCURSOR='s|^.*#Option.*"sw_cursor".*$|Option "sw_cursor"|g;'
  		MONITORLAYOUT='s|^.*#Option.*"MonitorLayout".*$|Option "MonitorLayout"|g;'
  	;;
-@@ -249,14 +336,24 @@
+@@ -249,14 +338,24 @@
  NOPM=""
  DPMS=""
  
@@ -223,7 +228,7 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
      /etc/X11/xorg.conf.in >/etc/X11/xorg.conf
 diff -Naur mkxf86config-0.9.10.orig/nvidiacards mkxf86config-0.9.10/nvidiacards
 --- mkxf86config-0.9.10.orig/nvidiacards	1970-01-01 01:00:00.000000000 +0100
-+++ mkxf86config-0.9.10/nvidiacards	2009-06-15 23:39:06.000000000 +0200
++++ mkxf86config-0.9.10/nvidiacards	2009-11-27 19:23:07.000000000 +0100
 @@ -0,0 +1,89 @@
 +GeForce.*GTX.*295
 +GeForce.*GTX.*285
@@ -316,7 +321,7 @@ diff -Naur mkxf86config-0.9.10.orig/nvidiacards mkxf86config-0.9.10/nvidiacards
 +
 diff -Naur mkxf86config-0.9.10.orig/xorg.conf.in mkxf86config-0.9.10/xorg.conf.in
 --- mkxf86config-0.9.10.orig/xorg.conf.in	2008-04-09 02:28:56.000000000 +0200
-+++ mkxf86config-0.9.10/xorg.conf.in	2009-06-16 00:07:55.000000000 +0200
++++ mkxf86config-0.9.10/xorg.conf.in	2009-11-27 19:23:07.000000000 +0100
 @@ -6,6 +6,7 @@
  #	InputDevice	"Serial Mouse" "AlwaysCore"
  	InputDevice	"USB Mouse" "AlwaysCore"
diff --git a/x11-misc/mkxf86config/mkxf86config-0.9.10-r9.ebuild b/x11-misc/mkxf86config/mkxf86config-0.9.10-r10.ebuild
similarity index 100%
rename from x11-misc/mkxf86config/mkxf86config-0.9.10-r9.ebuild
rename to x11-misc/mkxf86config/mkxf86config-0.9.10-r10.ebuild