diff --git a/x11-misc/mkxf86config/Manifest b/x11-misc/mkxf86config/Manifest
index 2eeb6b572..c21d62218 100644
--- a/x11-misc/mkxf86config/Manifest
+++ b/x11-misc/mkxf86config/Manifest
@@ -1,4 +1,4 @@
-AUX mkxf86config-0.9.10.patch 11018 RMD160 e1dc512ba33daca25bccb69ebcb3e47c7aedcfac SHA1 7f08fe7c48978864ae23edf2381bddd5221ef804 SHA256 64e149bbe5abc44160da17b659c69ae3cff2a890bde91ca1a4f62501862d26a8
+AUX mkxf86config-0.9.10.patch 11625 RMD160 8adb8a70770f4c5369ec5be6d439742c730d4f49 SHA1 955524d1fab94fe3c6fc1ba1bdbcffdd918face8 SHA256 9a112dbbe90b0d515d86be3dc255d587b3c2b26768b9c8a8a6de28f230bf4982
 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-r7.ebuild 1047 RMD160 834e7e92a6abec7ded68e1aa22fac86dcfd8bb2a SHA1 c059c868aab6d219c7ba2e8499533c543fbf80e4 SHA256 2a27ade21a149cb57b17251baaab17f638641aa827b5885187368ae77f931932
+EBUILD mkxf86config-0.9.10-r8.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 61722d7f8..c7fcb3d1d 100644
--- a/x11-misc/mkxf86config/files/mkxf86config-0.9.10.patch
+++ b/x11-misc/mkxf86config/files/mkxf86config-0.9.10.patch
@@ -1,32 +1,50 @@
 diff -Naur mkxf86config-0.9.10.orig/aticards mkxf86config-0.9.10/aticards
---- mkxf86config-0.9.10.orig/aticards	1970-01-01 00:00:00.000000000 +0000
-+++ mkxf86config-0.9.10/aticards	2009-05-02 21:46:15.916789855 +0000
-@@ -0,0 +1,21 @@
+--- mkxf86config-0.9.10.orig/aticards	1970-01-01 01:00:00.000000000 +0100
++++ mkxf86config-0.9.10/aticards	2009-06-02 10:49:11.000000000 +0200
+@@ -0,0 +1,31 @@
 +Radeon.*HD.*2350
 +Radeon.*HD.*2300
 +Radeon.*HD.*2400
 +Radeon.*HD.*2600
 +Radeon.*HD.*2900
++Radeon.*HD.*3430
++Radeon.*HD.*3450
++Radeon.*HD.*3470
++Radeon.*HD.*3690
++Radeon.*HD.*3830
 +Radeon.*HD.*3850
 +Radeon.*HD.*3870
 +Radeon.*HD.*3800
 +Radeon.*HD.*4350
 +Radeon.*HD.*4300
++Radeon.*HD.*4350
 +Radeon.*HD.*4550
 +Radeon.*HD.*4500
 +Radeon.*HD.*4650
 +Radeon.*HD.*4670
 +Radeon.*HD.*4600
++Radeon.*HD.*4650
++Radeon.*HD.*4670
++Radeon.*HD.*4830
 +Radeon.*HD.*4850
 +Radeon.*HD.*4870
++Radeon.*HD.*4890
 +Radeon.*HD.*4800
 +FireStream
 +RV770
 +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 03:27:36.000000000 +0000
-+++ mkxf86config-0.9.10/mkxf86config.sh	2009-05-02 21:47:22.048498729 +0000
-@@ -80,6 +80,48 @@
+--- mkxf86config-0.9.10.orig/mkxf86config.sh	2008-04-10 05:27:36.000000000 +0200
++++ mkxf86config-0.9.10/mkxf86config.sh	2009-06-02 10:50:42.000000000 +0200
+@@ -53,6 +53,7 @@
+ 			# We got a resolution on the command line, use it.
+ 			NEWMODE=$(echo ${x} | cut -d= -f2)
+ 			RAWMODES="\"${NEWMODE}\""
++		;;
+ 	esac
+ done
+ 
+@@ -80,6 +81,56 @@
  # We create this link since hwsetup cannot properly detect serial mice
  [ -e /dev/mouse ] || ln -sf /dev/ttyS0 /dev/mouse
  
@@ -60,22 +78,30 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
 +do
 +	case "$i" in
 +		-nocomposite*)  NOCOMPOSITE="true";;
++		-xvesa*)  XMODULE="vesa";;
 +		-xnvidia*)  XMODULE="nvidia";;
 +		-xati*)  XMODULE="fglrx";;
++		-xres\=*)
++			# We got a resolution on the command line, use it.
++			NEWMODE=$(echo ${i} | cut -d= -f2)
++			RAWMODES="\"${NEWMODE}\""
++		;;
 +		*)
 +			echo "Usage   : mkxf86config [options]"
 +			echo "Options : -nocomposite disable composite"
-+			echo "          -xnvidia     force nvidia selection"
 +			echo "          -xati        force ati selection"
++			echo "          -xnvidia     force nvidia selection"
++			echo "          -xvesa       force vesa selection"
++			echo "          -xres=x*y    force x resolution"
 +			exit 1
-+			;;
++		;;
 +	esac
 +done
 +
  PROTO="${XMOUSETYPE:-Microsoft}"
  NOEMU=""
  [ "${XEMU3}" = "no" ] && NOEMU='s|^.*Emulate3|# No 2 -> 3 Button emulation|g'
-@@ -89,11 +131,25 @@
+@@ -89,11 +140,25 @@
  
  if [ -n "${XMODULE}" ]
  then
@@ -85,35 +111,35 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
  		pvr2fb)
  			modprobe "${XMODULE}" >/dev/null 2>&1
  			XMODULE="fbdev"
-+			eselect opengl set xorg-x11 --dst-prefix=/etc/opengl
-+		;;
++			eselect opengl set xorg-x11
++			;;
 +		i810)
 +			XMODULE="intel"
-+			eselect opengl set xorg-x11 --dst-prefix=/etc/opengl
++			eselect opengl set xorg-x11
 +		;;
 +		fglrx)
-+			eselect opengl set ati --dst-prefix=/etc/opengl
++			eselect opengl set ati
 +		;;
 +		nvidia)
-+			eselect opengl set nvidia --dst-prefix=/etc/opengl
++			eselect opengl set nvidia
 +		;;
 +		*)
-+			eselect opengl set xorg-x11 --dst-prefix=/etc/opengl
++			eselect opengl set xorg-x11
  		;;
  	esac
  fi
-@@ -142,8 +198,8 @@
+@@ -142,8 +207,8 @@
  # working support for alpha/amd64/ppc/x86 for the 2007.0 Gentoo release.  If
  # anyone has more reliable, cross-platform methods, I'm all ears.
  #RAWMODES=$(ddcxinfo-knoppix -monitor | grep ModeLine | sed -r "s/.*\"([0-9]+x[0-9]+)\".*/\1/g"| sort -rg | uniq | xargs echo | sed -r "s/([0-9]+x[0-9]+)/\"\1\"/g")
 -[ -z "${RAWMODES}" ] && RAWMODES="\"1024x768\" \"800x600\" \"640x480\""
 -MODES="Modes ${RAWMODES}"
-+[ -n "${RAWMODES}" ] && MODES="Modes ${RAWMODES}"
 +MODES="#We let X11 auto-detect"
++[ -n "${RAWMODES}" ] && MODES="Modes ${RAWMODES}"
  
  # We need to check this because serial mice have long timeouts
  SERIALMOUSE="$(ls -l1 /dev/mouse* 2>/dev/null | awk '/ttyS/{print $NF ; exit 0}')"
-@@ -194,6 +250,15 @@
+@@ -194,6 +259,15 @@
  	else
  		SYNMOUSE='s|^.*InputDevice.*"Synaptics".*$|#No Synaptics touchpad found|g;'
  	fi
@@ -129,7 +155,7 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
  fi
  
  # Write Monitor data now
-@@ -212,6 +277,8 @@
+@@ -212,6 +286,8 @@
  	then
  		MOUSEDRIVER='s|^.*Driver.*"mouse".*$|\tDriver\t"vmmouse"|g;'
  	fi
@@ -138,7 +164,7 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
  fi
  
  #VirtualPC special handline
-@@ -220,6 +287,17 @@
+@@ -220,6 +296,17 @@
  then
  	VPC='s|^.*BusID.*PCI.*$|BusID "PCI:0:8:0"|g;'
  	DEPTH='s|DefaultColorDepth 24|DefaultColorDepth 16|g;'
@@ -156,7 +182,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 +313,10 @@
+@@ -235,10 +322,10 @@
  SWCURSOR=""
  MONITORLAYOUT=""
  case "${XMODULE}" in
@@ -169,7 +195,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 +327,24 @@
+@@ -249,14 +336,24 @@
  NOPM=""
  DPMS=""
  
@@ -196,13 +222,19 @@ diff -Naur mkxf86config-0.9.10.orig/mkxf86config.sh mkxf86config-0.9.10/mkxf86co
      -e 's|"XkbLayout" *"[^"]*"|"XkbLayout" "'"${XKEYBOARD}"'"|g;'"${DEADKEYS}" \
      /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 00:00:00.000000000 +0000
-+++ mkxf86config-0.9.10/nvidiacards	2009-05-02 21:46:15.916789855 +0000
-@@ -0,0 +1,83 @@
+--- mkxf86config-0.9.10.orig/nvidiacards	1970-01-01 01:00:00.000000000 +0100
++++ mkxf86config-0.9.10/nvidiacards	2009-06-02 10:49:11.000000000 +0200
+@@ -0,0 +1,89 @@
 +GeForce.*GTX.*295
 +GeForce.*GTX.*285
 +GeForce.*GTX.*280
++GeForce.*GTX.*275
 +GeForce.*GTX.*260
++GeForce.*GTS.*250
++GeForce.*GTS.*150
++GeForce.*GT.*130
++GeForce.*GT.*120
++GeForce.*G100
 +GeForce.*9800.*GX2
 +GeForce.*9800.*GTX+
 +GeForce.*9800.*GTX
@@ -283,8 +315,8 @@ diff -Naur mkxf86config-0.9.10.orig/nvidiacards mkxf86config-0.9.10/nvidiacards
 +Quadro.*NVS.*130M
 +
 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 00:28:56.000000000 +0000
-+++ mkxf86config-0.9.10/xorg.conf.in	2009-05-02 21:46:15.916789855 +0000
+--- 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-02 10:49:11.000000000 +0200
 @@ -6,6 +6,7 @@
  #	InputDevice	"Serial Mouse" "AlwaysCore"
  	InputDevice	"USB Mouse" "AlwaysCore"
diff --git a/x11-misc/mkxf86config/mkxf86config-0.9.10-r7.ebuild b/x11-misc/mkxf86config/mkxf86config-0.9.10-r8.ebuild
similarity index 100%
rename from x11-misc/mkxf86config/mkxf86config-0.9.10-r7.ebuild
rename to x11-misc/mkxf86config/mkxf86config-0.9.10-r8.ebuild