diff --git a/metacity.spec b/metacity.spec
index 0e1a3ec..d2b91fa 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.bz2
 License: GPL
@@ -31,6 +31,7 @@ Requires: redhat-artwork >= 0.62
 Requires: pkgconfig
 
 Requires(post): GConf2 >= 2.14
+Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
 Patch2: metacity-2.16.0-losing-focus.patch
@@ -90,18 +91,18 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="metacity.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+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
+fi
 
 %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
+   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 fi
 
 %postun -p /sbin/ldconfig
@@ -122,6 +123,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-7
+- Fix scripts according to packaging guidelines
+
 * Tue Oct 17 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-6
 - Add missing Requires (#203813)