diff --git a/.cvsignore b/.cvsignore
index fc04896..b31851a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-metacity-2.16.0.tar.bz2
+metacity-2.17.1.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index d2b91fa..fb4c16b 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,6 +1,6 @@
 %define gettext_package metacity
 
-%define metacity_version 2.16.0
+%define metacity_version 2.17.1
 
 %define metacity_filename metacity-%{metacity_version}
 
@@ -34,9 +34,6 @@ Requires(post): GConf2 >= 2.14
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
-Patch2: metacity-2.16.0-losing-focus.patch
-Patch3: metacity-2.16.0-currenttime-fixes.patch
-
 %description
 
 Metacity is a simple window manager that integrates nicely with 
@@ -45,9 +42,6 @@ GNOME 2.
 %prep
 %setup -q -n %{metacity_filename}
 
-%patch2 -p0 -b .losing-focus
-%patch3 -p1 -b .currenttime-fixes
-
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -91,18 +85,18 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null || :
 
 %pre 
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null || :
 fi
 
 %preun 
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/metacity.schemas > /dev/null || :
 fi
 
 %postun -p /sbin/ldconfig
@@ -123,6 +117,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 20 2006 Matthias Clasen <mclasen@redhat.com> - 2.17.1-1
+- Update to 2.17.1
+
 * Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-7
 - Fix scripts according to packaging guidelines
 
diff --git a/sources b/sources
index bef8ed8..c4372e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db1f2582681bf5eb0a8ecab45b622d7b  metacity-2.16.0.tar.bz2
+453e067804ada4a41f12a28a7508284a  metacity-2.17.1.tar.bz2