--- orig/ati-drivers-8.552.ebuild	2008-11-15 17:19:23.450204047 +0100
+++ new/ati-drivers-8.552.ebuild	2008-11-15 17:20:28.294204192 +0100
@@ -113,8 +113,12 @@
 		die "CONFIG_PARAVIRT enabled"
 	fi
 
-	# Only support xorg-server >=1.1
-	BASE_DIR="${S}/x710"
+	# determine which files we'll need to install...
+	if has_version '<x11-base/xorg-server-1.5.0' ; then
+	    BASE_DIR="${S}/x710"
+	else
+	    BASE_DIR="${S}/x740"
+	fi
 
 	# This is used like $(get_libdir) for paths in ati's package.
 	if use amd64 ; then
@@ -433,6 +437,12 @@
 	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
 	ewarn "in the Device Section of /etc/X11/xorg.conf."
 
+	# Warning concerning xorg-x11 updates
+	ewarn "This ebuild installs binary code which depends on your xorg-server"
+	ewarn "version. If you update from <xorg-x11-7.4 to >=xorg-x11-7.4 (i.e."
+	ewarn "<xorg-server-1.5 to >=xorg-server-1.5), then you will have to"
+	ewarn "remerge this package!"
+
 	linux-mod_pkg_postinst
 }