diff --git a/commit-cadf65a.diff b/commit-cadf65a.diff
deleted file mode 100644
index 4fabbc9..0000000
--- a/commit-cadf65a.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-commit cadf65a6e190a8952ad3cc216dc9ea55241de91a
-Author: Matthias Hopf <mhopf@suse.de>
-Date:   Tue Mar 10 15:49:49 2009 +0100
-
-    randr: Nuke broken set_origin shortcut
-    
-    Shortcut is impossible to implement this way, because we don't know for sure
-    whether the crtc of an output has changed or not.
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 7d6feaf..c6eed33 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -306,19 +306,6 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
-     } else
- 	crtc->transformPresent = FALSE;
- 
--    if (crtc->funcs->set_origin &&
--	memcmp (mode, &saved_mode, sizeof(saved_mode)) == 0 &&
--	saved_rotation == rotation &&
--	saved_transform_present == crtc->transformPresent &&
--	(!crtc->transformPresent || RRTransformEqual(&saved_transform, &crtc->transform)))
--    {
--	if (!xf86CrtcRotate (crtc))
--		goto done;
--	crtc->funcs->set_origin (crtc, crtc->x, crtc->y);
--	ret = TRUE;
--	goto done;
--    }
--
-     /* Pass our mode to the outputs and the CRTC to give them a chance to
-      * adjust it according to limitations or output properties, and also
-      * a chance to reject the mode entirely.
diff --git a/xorg-server-1.6.2.tar.bz2 b/xorg-server-1.6.2.tar.bz2
deleted file mode 100644
index f9638b4..0000000
--- a/xorg-server-1.6.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:893e92ad2ccd1bcd646bba9540dd9dfc53ccc95f8dc5fd69444afe54fae8c261
-size 4647067
diff --git a/xorg-server-1.6.3.tar.bz2 b/xorg-server-1.6.3.tar.bz2
new file mode 100644
index 0000000..b9ac06c
--- /dev/null
+++ b/xorg-server-1.6.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
+size 4651487
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index a90a240..a825d92 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sat Aug  1 10:47:53 CEST 2009 - sndirsch@suse.de
+
+- xorg-server 1.6.3
+  * This mostly just collects a bunch of minor fixes since 1.6.2.
+    Two notable inclusions are:
+    - Replacing dixLookupResource with dixLookupResourceByType,
+      dixLookupResourceByClass. This returns us to having two 
+      resource lookup functions, but this time we have a more
+      sensible name and argument set.
+    - Fixing RandR transforms for drivers providing set_mode_major.
+      These patches were originally slated to land in 1.6.2 but
+      I missed them somehow.
+- obsoletes commit-cadf65a.diff
+
 -------------------------------------------------------------------
 Wed Jul  8 02:09:43 CEST 2009 - sndirsch@novell.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index dc884aa..c2eb67e 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -20,7 +20,7 @@
 %define moblin 0
 
 Name:           xorg-x11-server
-%define dirsuffix 1.6.2
+%define dirsuffix 1.6.3
 %define fglrx_driver_hack 0
 ### FIXME
 %define vnc 1
@@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        46
+Release:        47
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -109,7 +109,6 @@ Patch125:       0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
 Patch127:       dpms_screensaver.diff
 Patch128:       pci-legacy-mem-fallback.diff
 Patch129:       bug474071-fix1.diff
-Patch131:       commit-cadf65a.diff
 Patch132:       fixed-SYNC-extension-trigger-BlockHandler-test.diff
 Patch140:       fbdev_fallback_fail_fix.diff
 Patch142:       bug-507190_xorg-x11-server-bnc381139-randr-reprobe-on-unsuspend.diff
@@ -238,7 +237,6 @@ popd
 pushd hw/xfree86/os-support/bus
 %patch129 -p0
 popd
-%patch131 -p1
 %patch132 -p1
 %patch140 -p1
 %patch142 -p1