diff --git a/.cvsignore b/.cvsignore
index 257d168..433f6b4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-1.7.1.tar.bz2
+xorg-server-1.7.3.tar.bz2
diff --git a/sources b/sources
index 0e45b8f..566b478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dda7842467cda6018fdc87e6002e4db1  xorg-server-1.7.1.tar.bz2
+4c63b22cad9ed8ae8b86561f0f92c327  xorg-server-1.7.3.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 82aeb98..4d7d646 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.1
-Release:   12%{dist}
+Version:   1.7.3
+Release:   1%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -77,12 +77,9 @@ Patch6045: xserver-1.7.0-randr-gamma-restore.patch
 Patch6047: xserver-1.7.0-glx-versioning.patch
 Patch6048: xserver-1.7.0-exa-fix-mixed.patch
 Patch6049: xserver-1.7.1-multilib.patch
-Patch6050: xserver-1.7.1-window-pictures.patch
 Patch6051: xserver-1.7.1-gamma-kdm-fix.patch
 Patch6052: xserver-1.7.1-libcrypto.patch
 Patch6053: xserver-1.7.1-sigaction.patch
-Patch6054: xserver-1.7.1-stat-sanity.patch
-Patch6055: xserver-1.7.1-window-picture-performance-regression.patch
 Patch6066: xserver-1.7.1-glx14-swrast.patch
 
 %define moduledir	%{_libdir}/xorg/modules
@@ -511,6 +508,14 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Dec 08 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.7.3-1
+- xserver 1.7.3
+- xserver-1.7.1-stat-sanity.patch: Drop, merged upstream.
+- xserver-1.7.1-window-pictures.patch: Drop, code it bases on reverted
+  upstream
+- xserver-1.7.1-window-picture-performance-regression.patch: Drop, code it
+  bases on reverted upstream.
+
 * Tue Nov 24 2009 Adam Jackson <ajax@redhat.com> 1.7.1-12
 - xserver-1.7.1-glx14-swrast.patch: Enable GLX 1.4 for software GLX.
 
diff --git a/xserver-1.7.1-stat-sanity.patch b/xserver-1.7.1-stat-sanity.patch
deleted file mode 100644
index 6dc4ca4..0000000
--- a/xserver-1.7.1-stat-sanity.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2db157924b582933c4b6897505e6f4170e23b56f Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 13 Oct 2009 10:15:00 +1000
-Subject: [PATCH] loader: actually stat something that has some chance of existing. (v2)
-
-FindModuleInSubdir seems to expect a / at the end of the subdir its
-finding for, so we add the / early, the stat will fail if its
-not a subdir, I'm leaving the S_ISDIR in just in case there is another
-reason it could return 0. This does look a bit silly in strace
-but it seems to work fine.
-
-I have a very intermittent issue where drivers loses its / that
-I've been seeing on/off for a while, this may or may not fix it.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit d85ab6b6483d6ca7d9d22298d05ed1fa3076b042)
----
- hw/xfree86/loader/loadmod.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
-index 0b220f1..5b175a5 100644
---- a/hw/xfree86/loader/loadmod.c
-+++ b/hw/xfree86/loader/loadmod.c
-@@ -399,8 +399,11 @@ FindModuleInSubdir(const char *dirpath, const char *module)
-     while ((direntry = readdir(dir))) {
-         if (direntry->d_name[0] == '.')
-             continue;
--        if ((stat(direntry->d_name, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
--            snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name);
-+        snprintf(tmpBuf, PATH_MAX, "%s%s/", dirpath, direntry->d_name);
-+	/* the stat with the appended / fails for normal files,
-+	   and works for sub dirs fine, looks a bit strange in strace
-+	   but does seem to work */
-+        if ((stat(tmpBuf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
-             if ((ret = FindModuleInSubdir(tmpBuf, module)))
-                 break;
-             continue;
--- 
-1.6.5.2
-