diff --git a/.cvsignore b/.cvsignore
index e1d48fe..bbf1bd7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-screensaver-2.18.0.tar.bz2
+gnome-screensaver-2.18.2.tar.bz2
diff --git a/gnome-screensaver.spec b/gnome-screensaver.spec
index 8ea58b6..991d4af 100644
--- a/gnome-screensaver.spec
+++ b/gnome-screensaver.spec
@@ -12,22 +12,17 @@
 
 Summary: GNOME Screensaver
 Name: gnome-screensaver
-Version: 2.18.0
-Release: 13%{?dist} 
+Version: 2.18.2
+Release: 1%{?dist} 
 License: GPL
 Group: Amusements/Graphics
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-screensaver/2.18/%{name}-%{version}.tar.bz2
 Source1: gnome-screensaver-hide-xscreensaver.menu
 
 Patch1: gnome-screensaver-2.15.4-default-theme.patch
 Patch2: gnome-screensaver-2.18.0-securitytoken.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=424737
 Patch3: gnome-screensaver-2.18.0-user-dirs.patch
-Patch4: gnome-screensaver-2.18.0-require-mouse-grab.patch
-# fixed in upstream trunk
-Patch5: gnome-screensaver-2.18.0-power-preferences.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=428199
-Patch6: gnome-screensaver-2.18.0-standard-flexi-server.patch
 
 Patch7: gnome-screensaver-2.18.0-handle-overlapping-heads.patch
 
@@ -73,9 +68,6 @@ simple, sane, secure defaults and be well integrated with the desktop.
 %patch1 -p1 -b .use-floaters-by-default
 %patch2 -p1 -b .securitytoken
 %patch3 -p1 -b .user-dirs
-%patch4 -p1 -b .require-mouse-grab
-%patch5 -p1 -b .power-preferences
-%patch6 -p1 -b .standard-flexi-server
 %patch7 -p1 -b .handle-overlapping-screens
 
 %build
@@ -133,6 +125,10 @@ fi
 %{_sysconfdir}/pam.d/*
 
 %changelog
+* Tue May 29 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.2-1
+- Update to 2.18.2
+- Drop upstreamed patches
+
 * Mon May 21 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-13
 - Yet another crack at bug 238961.
 
diff --git a/sources b/sources
index 2c9fc8d..a9f256b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c123d954b215d970dad117b15ca46cd7  gnome-screensaver-2.18.0.tar.bz2
+b5931e1f39c62acee0df1fcf016ddc39  gnome-screensaver-2.18.2.tar.bz2