--- /usr/portage/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild	2010-03-30 19:36:03.000000000 -0700
+++ /usr/portage/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild	2010-04-23 22:17:00.000000000 -0700
@@ -66,8 +66,11 @@ 
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/input
 
+		# xorg-server-1.7
+		if has_version ">=x11-base/xorg-server-1.7" ; then
+				newins vboxmouse_drv_17.so vboxmouse_drv.so
 		# xorg-server-1.6.x
-		if has_version ">=x11-base/xorg-server-1.6" ; then
+		elif has_version ">=x11-base/xorg-server-1.6" ; then
 				newins vboxmouse_drv_16.so vboxmouse_drv.so
 		# xorg-server-1.5.x
 		else