diff -ru xorg-ubuntu-git.orig/debian/local/Failsafe/failsafeXServer xorg-ubuntu-git/debian/local/Failsafe/failsafeXServer
--- xorg-ubuntu-git.orig/debian/local/Failsafe/failsafeXServer	2009-11-09 08:58:44.000000000 +0100
+++ xorg-ubuntu-git/debian/local/Failsafe/failsafeXServer	2009-12-06 13:21:02.000000000 +0100
@@ -24,6 +24,8 @@
 # not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA 02111-1307 USA
 
+[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/gdm" ] || exit 0
+
 xorg_conf_failsafe=${BPX_XORG_CONF_FAILSAFE:-"/etc/X11/xorg.conf.failsafe"}
 xorg_conf=${BPX_XORG_CONF:-"/etc/X11/xorg.conf"}
 run_dexconf=${BPX_RUN_DEXCONF:-"yes"}