--- /usr/share/eselect/modules/xvmc.eselect	2010-08-04 03:20:01.000000000 -0300
+++ Desktop/xvmc.eselect	2010-08-24 10:05:54.875540596 -0300
@@ -14,7 +14,8 @@
 "libchromeXvMC.so.1"
 "libviaXvMCPro.so.1"
 "libchromeXvMCPro.so.1"
-"libI810XvMC.so.1" )
+"libI810XvMC.so.1"
+"libIntelXvMC.so.1" )
 XVMCPRETTY=(
 "nvidia"
 "xorg-x11"
@@ -22,7 +23,8 @@
 "openchrome"
 "via-pro"
 "openchrome-pro"
-"intel" )
+"intel-i810"
+"intel-i915" )
 
 get_implementation_indices() {
 	local ret n
@@ -36,7 +38,7 @@
 get_current_implementation_index() {
 	local n
 	if [[ -f "${ROOT}/etc/X11/XvMCConfig" ]]; then
-		local current=$(< "${ROOT}/etc/X11/XvMCConfig")
+		local current=$(basename $(< "${ROOT}/etc/X11/XvMCConfig"))
 		for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do
 			if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then
 				echo "${n}"
@@ -52,7 +54,7 @@
 	echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..."
 	touch "${ROOT}/etc/X11/XvMCConfig" 2&>1 > /dev/null
 	if [[ $? -eq 0 ]]; then
-		echo "${XVMCLIBS[$1]}" > "${ROOT}/etc/X11/XvMCConfig"
+		echo "${ROOT}/usr/lib/${XVMCLIBS[$1]}" > "${ROOT}/etc/X11/XvMCConfig"
 		chmod 644 "${ROOT}/etc/X11/XvMCConfig"
 		chown 0:0 "${ROOT}/etc/X11/XvMCConfig"
 		echo " done"