diff --git a/.cvsignore b/.cvsignore
index 1d91ec2..a789dff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-1.7.4.902.tar.bz2
+xorg-server-1.7.5.tar.bz2
diff --git a/sources b/sources
index 4f13c4a..b48afc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39862aa5f62c681a7c83533fc1225432  xorg-server-1.7.4.902.tar.bz2
+2856130aebf56e3df7b7d9be419bfb28  xorg-server-1.7.5.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 1134e61..daf6ad3 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -18,8 +18,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.7.4.902
-Release:   6%{dist}
+Version:   1.7.5
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -87,8 +87,6 @@ Patch6067: xserver-1.7.3-exa-master.patch
 # FIXME: merged upstream, but not quite correct yet
 Patch6069: xserver-1.7.3-cursor-jumps.patch
 Patch6070: xserver-1.7.3-no-free-on-abort.patch
-# 540584
-Patch6071: xserver-1.7.4-reset-sli-pointers.patch
 # 543647
 Patch6074: xserver-1.7.4-owner-events.patch
 # 558613
@@ -526,6 +524,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Feb 16 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.5-1
+- xserver 1.7.5
+- xserver-1.7.4-reset-sli-pointers.patch: drop, upstream.
+
 * Mon Feb 15 2010 Adam Jackson <ajax@redhat.com> 1.7.4.902-6
 - Drop the RANDR output unify patches, just too broken. (#565555)
 
diff --git a/xserver-1.7.4-reset-sli-pointers.patch b/xserver-1.7.4-reset-sli-pointers.patch
deleted file mode 100644
index 41a6c54..0000000
--- a/xserver-1.7.4-reset-sli-pointers.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 11eea736f44a236dde884b52ad51cb5d1271b7a5 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 13 Jan 2010 15:03:45 +1000
-Subject: [PATCH] Xi: reset the sli pointers after copying device classes. (#25640)
-
-If the indicator flags have the XkbSLI_IsDefault bit set, the indicator map
-and names aren't their own bit of memory but rather point into the
-device->key->xkbInfo->desc structure. XkbCopySrvLedInfo knows about this and
-leaves the pointers alone.
-
-When copying the classes from the slave to the master, these pointers are
-copied and still point to the dev->key class of the slave device. If the
-slave device is removed, the memory becomes invalid and a call to modify
-this data (e.g. XkbSetIndicators) may cause a deadlock.
-
-The copying of dev->key relies on dev->kbdfeed to be already set up. Hence
-the pointers need to be reset once _both_ kbdfeed and key have been copied
-into the master device.
-
-X.Org Bug 25640 <http://bugs.freedesktop.org/show_bug.cgi?id=25640>
-Fedora Bug 540584 <https://bugzilla.redhat.com/show_bug.cgi?id=540584>
----
- Xi/exevents.c |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index cb2452b..ee32ba8 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -444,6 +444,26 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)
-         to->key      = NULL;
-     }
- 
-+    /* If a SrvLedInfoPtr's flags are XkbSLI_IsDefault, the names and maps
-+     * pointer point into the xkbInfo->desc struct.  XkbCopySrvLedInfo
-+     * didn't update the pointers so we need to do it manually here.
-+     */
-+    if (to->kbdfeed)
-+    {
-+        KbdFeedbackPtr k;
-+
-+        for (k = to->kbdfeed; k; k = k->next)
-+        {
-+            if (!k->xkb_sli)
-+                continue;
-+            if (k->xkb_sli->flags & XkbSLI_IsDefault)
-+            {
-+                k->xkb_sli->names = to->key->xkbInfo->desc->names->indicators;
-+                k->xkb_sli->maps = to->key->xkbInfo->desc->indicators->maps;
-+            }
-+        }
-+    }
-+
-     /* We can't just copy over the focus class. When an app sets the focus,
-      * it'll do so on the master device. Copying the SDs focus means losing
-      * the focus.
--- 
-1.6.6
-