diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index bfb9e86..4abb37c 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -689,6 +689,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 23 2008 Cortland Setlow <cortland.setlow@gmail.com> 1.4-9
+- Adapt HAL's input device hints into a form useful to the evdev driver.
+  (Hopefully all this will vanish in the shift to Fedora 9.)
+
 * Fri Nov 24 2007 Bernardo Innocenti <bernie@codewiz.org> 1.4-8
 - Drop xorg.conf (the master copy is in olpc-utils)
 
diff --git a/xorg.conf b/xorg.conf
deleted file mode 100644
index bfb6cbb..0000000
--- a/xorg.conf
+++ /dev/null
@@ -1,79 +0,0 @@
-# Xorg configuration file for OLPC
-
-Section "ServerLayout"
-        Identifier     "Default Layout"
-        Screen      0  "Screen0" 0 0
-	InputDevice    "fake" "CorePointer" "CoreKeyboard"
-EndSection
-
-# Fool 1.4 autoconf into seeing a mouse and keyboard so it won't
-# try to synthetize them
-Section "InputDevice"
-        Identifier  "fake"
-        Driver      "void"
-EndSection
-
-Section "Module"
-	SubSection "extmod"
-		Option "omit XFree86-DGA"
-		Option "omit XFree86-Misc"
-		Option "omit MIT-SUNDRY-NONSTANDARD"
-		Option "omit TOG-CUP"
-		Option "omit Extended-Visual-Information"
-	EndSubSection
-        Load  "freetype"
-        Load  "evdev"
-	# Load "record" # Mostly a debugging tool
-EndSection
-
-Section "Extensions"
-	Option  "XTEST" "Disable" # Mostly a debugging tool
-	#Option  "SECURITY" "Disable" # CRASH!
-	Option  "XC-APPGROUP" "Disable"
-	Option  "XINERAMA" "Disable"
-EndSection
-
-Section "ServerFlags"
-       Option      "AllowMouseOpenFail" "yes"
-EndSection
-
-Section "Monitor"
-        Identifier  "DCON"
-        HorizSync   30-67
-        VertRefresh 48-52 
-        DisplaySize 152 114
-        Mode "1200x900"
-                DotClock 57.275
-                HTimings 1200 1208 1216 1240
-                VTimings 900 905 908 912
-                Flags    "-HSync" "-VSync"
-        EndMode
-EndSection
-
-Section "Device"
-        Identifier  "Geode"
-        Driver      "amd"
-        VendorName  "Advanced Micro Devices, Inc."
-        BoardName   "AMD Geode GX/LX"
-
-        # Disable VGA for the OLPC board
-        Option      "NoVGA"  "true"
-        
-        Option     "AccelMethod" "EXA"
-        Option     "NoCompression" "true"
-        Option     "CustomMode" "true"
-        Option     "DconPanel" "true"
-        Option     "PanelGeometry" "1200x900"
-EndSection
-
-Section "Screen"
-        Identifier "Screen0"
-        Device     "Geode"
-        Monitor    "DCON"
-        DefaultDepth 16
-
-        SubSection "Display"
-                Depth   16
-                Modes   "1200x900"
-        EndSubSection
-EndSection
diff --git a/xserver-1.4-hal-touchpad.patch b/xserver-1.4-hal-touchpad.patch
index a2d3cc3..d77ea91 100644
--- a/xserver-1.4-hal-touchpad.patch
+++ b/xserver-1.4-hal-touchpad.patch
@@ -2,14 +2,18 @@ diff --git a/config/hal.c b/config/hal.c
 index 3479be9..a235876 100644
 --- a/config/hal.c
 +++ b/config/hal.c
-@@ -177,7 +177,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+@@ -177,7 +177,13 @@ device_added(LibHalContext *hal_ctx, const char *udi)
          if (strcmp(props[i], "input.keys") == 0 ||
              strcmp(props[i], "input.keyboard") == 0)
              type |= TYPE_KEYS;
--        if (strcmp(props[i], "input.mouse") == 0)
-+        if (strcmp(props[i], "input.mouse") == 0 ||
-+            strcmp(props[i], "input.touchpad") == 0)
+         if (strcmp(props[i], "input.mouse") == 0)
++        {
++            type |= TYPE_POINTER;
++            add_option(&options, "Mode", "Relative");
++        } else if (strcmp(props[i], "input.touchpad") == 0) {
              type |= TYPE_POINTER;
++            add_option(&options, "Mode", "Absolute");
++        }
      }
      libhal_free_string_array(props);
 diff --git a/config/x11-input.fdi b/config/x11-input.fdi
@@ -58,3 +62,36 @@ index c390706..20c73fa 100644
        <merge key="input.xkb.model" type="string">pc105</merge>
        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name"
               string="Linux">
+diff -u -r a/config/hal.c a/config/hal.c
+--- a/config/hal.c	2008-03-23 10:43:43.000000000 -0400
++++ b/config/hal.c	2008-03-23 10:41:17.000000000 -0400
+@@ -163,6 +163,14 @@
+ 
+     dbus_error_init(&error);
+ 
++    options = xcalloc(sizeof(*options), 1);
++    options->key = xstrdup("_source");
++    options->value = xstrdup("server/hal");
++    if (!options->key || !options->value) {
++        ErrorF("[config] couldn't allocate first key/value pair\n");
++        goto unwind;
++    }
++
+     props = libhal_device_get_property_strlist(hal_ctx, udi,
+                                                "info.capabilities", &error);
+     if (!props) {
+@@ -209,14 +217,6 @@
+         xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb.options");
+     }
+ 
+-    options = xcalloc(sizeof(*options), 1);
+-    options->key = xstrdup("_source");
+-    options->value = xstrdup("server/hal");
+-    if (!options->key || !options->value) {
+-        ErrorF("[config] couldn't allocate first key/value pair\n");
+-        goto unwind;
+-    }
+-
+     add_option(&options, "path", path);
+     add_option(&options, "driver", driver);
+     add_option(&options, "name", name);