diff -Nru xorg-server-1.5.2/debian/changelog xorg-server-1.5.2/debian/changelog
--- xorg-server-1.5.2/debian/changelog	2008-10-17 23:23:34.000000000 -0700
+++ xorg-server-1.5.2/debian/changelog	2008-10-17 23:23:35.000000000 -0700
@@ -1,3 +1,13 @@
+xorg-server (2:1.5.2-1ubuntu6) hardy; urgency=low
+
+  * 143_default_to_vesa.patch:  If no matching driver is found in the
+    .ids files, set "vesa" as a fallback default, otherwise a driver
+    may be selected regardless of whether it actually provides support
+    for the chipset by videoPtrToDriverList() based on its vendor id.
+    (LP: #261977)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 17 Oct 2008 19:51:40 -0700
+
 xorg-server (2:1.5.2-1ubuntu5) intrepid; urgency=low
 
   * Expand 135_rethrow_signals.patch: There is also an abort() deep within
diff -Nru /tmp/W8rNHJUFYZ/xorg-server-1.5.2/debian/patches/143_default_to_vesa.patch /tmp/0wIIJFnGKb/xorg-server-1.5.2/debian/patches/143_default_to_vesa.patch
--- xorg-server-1.5.2/debian/patches/143_default_to_vesa.patch	1969-12-31 16:00:00.000000000 -0800
+++ xorg-server-1.5.2/debian/patches/143_default_to_vesa.patch	2008-10-17 23:23:35.000000000 -0700
@@ -0,0 +1,25 @@
+
+diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c working/hw/xfree86/common/xf86AutoConfig.c
+--- patched/hw/xfree86/common/xf86AutoConfig.c	2008-10-17 19:48:15.000000000 -0700
++++ working/hw/xfree86/common/xf86AutoConfig.c	2008-10-17 19:43:19.000000000 -0700
+@@ -422,6 +422,20 @@ matchDriverFromFiles (char** matches, ui
+         }
+         direntry = readdir(idsdir);
+     }
++    /* If we failed to find any driver, at least try 'vesa' (LP: #261977) */
++    if (matches[0] == NULL) {
++        xf86Msg(X_INFO, "No matches found for this device in %s\n",  PCI_TXT_IDS_PATH);
++
++        matches[0] = (char*)xalloc(sizeof(char) * 5);
++        if (!matches[0]) {
++            xf86Msg(X_ERROR, "Could not allocate space for the module name. Exiting.\n");
++            goto end;
++        }
++
++        xf86Msg(X_DEFAULT, "Registering 'vesa' as fallback\n");
++        strncpy(matches[0], "vesa", 5);
++    }
++
+  end:
+     xfree(line);
+     closedir(idsdir);
diff -Nru /tmp/W8rNHJUFYZ/xorg-server-1.5.2/debian/patches/series /tmp/0wIIJFnGKb/xorg-server-1.5.2/debian/patches/series
--- xorg-server-1.5.2/debian/patches/series	2008-10-17 23:23:34.000000000 -0700
+++ xorg-server-1.5.2/debian/patches/series	2008-10-17 23:23:35.000000000 -0700
@@ -15,3 +15,4 @@
 140_quell_acpi_errmsgs.patch
 141_improved_driver_selection.patch
 142_psb_auto.patch
+143_default_to_vesa.patch