diff --git a/xorg/xorg-server/xorg-server.conf b/xorg/xorg-server/xorg-server.conf
index d9ce3378b..66be800e5 100644
--- a/xorg/xorg-server/xorg-server.conf
+++ b/xorg/xorg-server/xorg-server.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../xorg-server/xorg-server.conf
-# Copyright (C) 2007 - 2009 The OpenSDE Project
+# Copyright (C) 2007 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -44,3 +44,9 @@ var_append GCC_WRAPPER_REMOVE ' ' '-I/usr/X11R6/include'
 var_append GCC_WRAPPER_REMOVE ' ' '-L/usr/X11R6/lib'
 
 hook_add postmake 5 "x_postmake"
+
+if ! pkginstalled mesa; then
+	for x in glx dri xprint; do
+		var_append extraconfopt ' ' "--disable-$x"
+	done
+fi