--- xserver-xorg.config.orig	2006-12-17 21:25:05.000000000 +0100
+++ xserver-xorg.config	2006-12-18 15:46:41.000000000 +0100
@@ -1545,17 +1545,11 @@
   # make sure to ask the driver on sparc till we have a reliable way
   # to gather these info properly.
   #
-  # make it possible to use vesa as default for x86*
 
   case "$ARCH" in
     sparc)
       PRIORITY=high
       ;;
-    i386|amd64)
-      if [ -n "$XFORCEVESA" ] || [ -n "$(grep xforcevesa /proc/cmdline)" ]; then
-        DEFAULT_DRIVER=vesa
-      fi
-      ;;
   esac
 
 # now the default-x-server question may be asked
@@ -1616,6 +1610,16 @@
 
 observe "available video driver list set to \"$DRIVER_LIST\""
 
+if [ -n "$XFORCEVESA" ] || [ -n "$(grep xforcevesa /proc/cmdline)" ]; then
+  # don't autodetect the video card, but always use the default driver instead
+  AUTODETECT_VIDEO_CARD=false
+  
+  # FIXME: should "xserver-xorg/autodetect_video_card" also be set to "false"?
+  # NOTE: "xforcevesa" should really be "xsafemode", since the default safe mode
+  #       happens to be arch specific (see how DEFAULT_DRIVER is set a few lines
+  #       above).
+fi
+
 if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
   if which discover >/dev/null 2>&1; then
     if [ "$AUTODETECT_VIDEO_CARD" = "true" ]; then