diff --git a/.cvsignore b/.cvsignore
index a07b446..845087f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-20080609.tar.bz2
+xorg-server-20080612.tar.bz2
diff --git a/commitid b/commitid
index e9a4078..3388349 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-c7c43285b139952d03e60db1b95306941ad094ee
+53a84d75c65f75c629c6610a2ec4093507cea3f7
diff --git a/sources b/sources
index 3f84435..212093e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b451851a213ff4d2232e06a5150d5d72  xorg-server-20080609.tar.bz2
+067f2f0fdbcac0f8a7cd4f4ee046a2c8  xorg-server-20080612.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 106a42f..d4d41ac 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080609
+%define gitdate 20080612
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.902
-Release:   1.%{gitdate}%{?dist}
+Release:   2.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -510,6 +510,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 12 2008 Dave Airlie <airlied@redhat.com> 1.4.99.902-2.20080612
+- cve-2008-1377: Record and Security Extension Input validation
+- cve-2008-1379: MIT-SHM extension Input Validation flaw
+- cve-2008-2360: Render AllocateGlyph extension Integer overflows
+- cve-2008-2361: Render CreateCursor extension Integer overflows
+- cve-2008-2362: Render Gradient extension Integer overflows
+- Rebase to 1.5 head for security patches for above
+
 * Mon Jun 09 2008 Adam Jackson <ajax@redhat.com> 1.4.99.902-1.20080609
 - Today's git snapshot.
 
diff --git a/xserver-1.5.0-no-evdev-keyboards-kthnx.patch b/xserver-1.5.0-no-evdev-keyboards-kthnx.patch
index e4f0dc5..fa368bd 100644
--- a/xserver-1.5.0-no-evdev-keyboards-kthnx.patch
+++ b/xserver-1.5.0-no-evdev-keyboards-kthnx.patch
@@ -1,40 +1,58 @@
-From 749698f0f4677758349bc652ee12b3a69ae8ca5c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 18 Mar 2008 15:11:13 -0400
-Subject: [PATCH] Disable evdev for keyboards even harder.
+From e654ed62d44b8d61484f97eab1b1adbfb08d375f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Thu, 12 Jun 2008 11:52:29 +1000
+Subject: [PATCH] config: disable evdev for keyboards
 
-Hrngh argh hatred.
 ---
- config/hal.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ config/hal.c |   28 ++++++++++++++++++++++++++++
+ 1 files changed, 28 insertions(+), 0 deletions(-)
 
 diff --git a/config/hal.c b/config/hal.c
-index 1575422..ec49f2a 100644
+index f4eb438..ee0f18f 100644
 --- a/config/hal.c
 +++ b/config/hal.c
-@@ -174,16 +174,16 @@ device_added(LibHalContext *hal_ctx, const char *udi)
-         goto out_error;
-     }
-     for (i = 0; props[i]; i++) {
--        /* input.keys is the new, of which input.keyboard is a subset, but
--         * input.keyboard is the old 'we have keys', so we have to keep it
--         * around. */
--        if (strcmp(props[i], "input.keys") == 0 ||
--            strcmp(props[i], "input.keyboard") == 0)
--            type |= TYPE_KEYS;
-         if (strcmp(props[i], "input.mouse") == 0 ||
-             strcmp(props[i], "input.touchpad") == 0)
-             type |= TYPE_POINTER;
-     }
-+    /* XXX skip keyboards.  seriously. */
+@@ -168,6 +168,31 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
+ }
+ #endif
+ 
++static Bool
++get_device_is_keyboard(LibHalContext *hal_ctx, const char *udi, DBusError *error_p)
++{
++    char **props;
++    int i;
++    Bool ret = FALSE;
++
++    props = libhal_device_get_property_strlist(hal_ctx, udi,
++					"info.capabilities", error_p);
++    if (!props) {
++	return FALSE;
++    }
 +    for (i = 0; props[i]; i++) {
-+        if (strcmp(props[i], "input.keys") == 0 ||
-+            strcmp(props[i], "input.keyboard") == 0)
-+            type = TYPE_NONE;
++	if (strcmp(props[i], "input.keys") == 0 ||
++            strcmp(props[i], "input.keyboard") == 0) {
++		ret = TRUE;
++		goto out_error;
++	}
 +    }
-     libhal_free_string_array(props);
++
++out_error:
++    libhal_free_string_array(props);
++    return ret;
++}
++
+ static void
+ device_added(LibHalContext *hal_ctx, const char *udi)
+ {
+@@ -184,6 +209,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
+ 
+     dbus_error_init(&error);
  
-     if (type == TYPE_NONE)
++    if (get_device_is_keyboard(hal_ctx, udi, &error))
++	goto unwind;
++
+     driver = get_prop_string(hal_ctx, udi, "input.x11_driver");
+     if (!driver){
+         /* verbose, don't tell the user unless they _want_ to see it */
 -- 
-1.5.4.5
+1.5.3.7