diff --git a/.cvsignore b/.cvsignore
index 147b07c..6c7b33e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,13 +1 @@
-libcm-0.0.17.tar.gz
-metacity-2.15.0.20060331.tar.gz
-libcm-0.0.18.tar.gz
-libcm-0.0.19.tar.gz
-metacity-2.15.0.apr13-2006.tar.gz
-metacity-2.14.3.tar.bz2
-metacity-2.15.2.tar.bz2
-libcm-0.0.21.tar.gz
-metacity-2.15.3.tar.bz2
-libcm-0.0.22.tar.gz
-metacity-2.15.5-jun1-2006.tar.gz
-metacity-2.15.5-jun6-2006.tar.gz
-metacity-2.15.13.tar.gz
+metacity-2.15.21.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index c2f237f..14e5876 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,15 +1,15 @@
 %define gettext_package metacity
 
-%define metacity_version 2.15.13
+%define metacity_version 2.15.21
 
 %define metacity_filename metacity-%{metacity_version}
 
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 2
+Release: 1%{?dist}
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
-Source0: %{metacity_filename}.tar.gz
+Source0: %{metacity_filename}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -18,8 +18,7 @@ BuildRequires: pango-devel >= 1.2.0
 BuildRequires: fontconfig-devel
 BuildRequires: GConf2-devel >= 2.2.0
 BuildRequires: desktop-file-utils >= 0.3
-BuildRequires: libglade2-devel >= 2.0.0
-BuildRequires: intltool >= 0.35
+BuildRequires: libglade2-devel >= 2.0.0BuildRequires: intltool >= 0.35
 BuildRequires: startup-notification-devel >= 0.7
 BuildRequires: libtool automake autoconf gettext
 BuildRequires: xorg-x11-proto-devel >= 7.0-13
@@ -91,6 +90,15 @@ for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
+%preun 
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  SCHEMAS="metacity.schemas"
+  for S in $SCHEMAS; do
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
+  done
+fi
+
 %postun -p /sbin/ldconfig
 
 %files -f %{gettext_package}.lang
@@ -109,6 +117,10 @@ done
 %{_mandir}/man1/*
 
 %changelog
+* Sun Aug 13 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.21-1.fc6
+- Update to 2.15.21
+- Uninstall gconf schemas in %%preun
+
 * Mon Aug 7 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.13-2
 - Remove leftover snapshot string.
 
diff --git a/sources b/sources
index de7e942..c98f4a8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-9675b782627ef9fdbbaaec30ee9f1b77  libcm-0.0.22.tar.gz
-6b09abf0f66bc7a6f595b6f6be180a69  metacity-2.15.5-jun6-2006.tar.gz
-dd4c19b5332102166735c1482252ac5e  metacity-2.15.13.tar.gz
+31fbcba45bc370300db7aa08de54b1c7  metacity-2.15.21.tar.bz2