diff --git a/.cvsignore b/.cvsignore
index bcbcf77..408a672 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xorg-server-1.8.0.tar.bz2
+xorg-server-1.8.2.tar.bz2
diff --git a/sources b/sources
index f939c06..2aa39ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cec3a11890bb53f4a07854319360348  xorg-server-1.8.0.tar.bz2
+c4156e3e71123a54413e629f4806fc71  xorg-server-1.8.2.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 52cc4ae..c7e3125 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.8.0
-Release:   17%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.8.2
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -86,20 +86,8 @@ Patch6052: xserver-1.8-udev-warning.patch
 # fallback to vesa when module is missing seems broken
 Patch6053: xserver-1.8-disable-vboxvideo.patch
 
-Patch6055: xserver-1.7.6-export-dix-functions.patch
-Patch6056: xserver-1.7.6-export-more-dix-functions.patch
-Patch6057: xserver-1.8.0-xorg.conf.d-changes.patch
-# Backports from master
-Patch6058: xserver-1.8.0-swap-fixes.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=27767 (plus related
-# pieces needed backported from master)
-Patch6059: xserver-1.8.0-resource-accounting.patch
-Patch6060: xserver-1.8.0-glxdri2-resource-conversion.patch
-
 Patch6061: xserver-1.8-no-connected-outputs.patch
 Patch6062: xserver-1.8-randr-initial.patch
-# Bug 567835  - mouse input under xinerama fails for out of order screen
-Patch6063: xserver-1.8.0-signed-deviceevents.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -541,6 +529,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Jul 01 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.8.2-1
+- xserver 1.8.2
+- drop upstreamed patches
+
 * Fri Jun 18 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.8.0-17
 - xserver-1.8.0-signed-deviceevents.patch: make device events signed
   (#567835)
diff --git a/xserver-1.4.99-pic-libxf86config.patch b/xserver-1.4.99-pic-libxf86config.patch
index 747a104..d040900 100644
--- a/xserver-1.4.99-pic-libxf86config.patch
+++ b/xserver-1.4.99-pic-libxf86config.patch
@@ -1,11 +1,14 @@
-From dc9f6e5021699fef97318ebc43f0e6c58a12d696 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 10 Dec 2007 11:26:57 -0500
+From 04bd8e2fa6be557f58a0e417b0f3befc56f5ef59 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x@fedoraproject.org>
+Date: Thu, 1 Jul 2010 15:45:03 +1000
 Subject: [PATCH] Build libxf86config with -fPIC.
 
+---
+ hw/xfree86/parser/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 49c191f..fea3b24 100644
+index caf7079..655e73f 100644
 --- a/hw/xfree86/parser/Makefile.am
 +++ b/hw/xfree86/parser/Makefile.am
 @@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \
@@ -15,8 +18,8 @@ index 49c191f..fea3b24 100644
 -libxf86config_a_CFLAGS = $(AM_CFLAGS)
 +libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden
  
- AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
- 
+ AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
+ 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 -- 
-1.6.6.1
+1.7.1