diff --git a/totem.spec b/totem.spec
index 9a71454..aa123b1 100644
--- a/totem.spec
+++ b/totem.spec
@@ -5,7 +5,7 @@
 Summary: Movie player for GNOME 2
 Name: totem
 Version: 2.16.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.hadess.net/totem.php3
@@ -13,7 +13,9 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/0.99/totem-%{version}.tar.
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch1: totem-0.99.19-feature-help-removal.patch
 
-Requires(post): GConf2
+Requires(pre): GConf2 >= 2.14
+Requires(post): GConf2 >= 2.14
+Requires(preun): GConf2 >= 2.14
 Requires(post): desktop-file-utils
 
 Requires(postun): desktop-file-utils
@@ -118,19 +120,26 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
 SCHEMAS="totem.schemas totem-handlers.schemas totem-video-thumbnail.schemas" 
-
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule \
-    %{_sysconfdir}/gconf/schemas/$S \
-     >/dev/null || :
+	%{_sysconfdir}/gconf/schemas/$S >/dev/null || :
 done
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    SCHEMAS="totem.schemas totem-handlers.schemas totem-video-thumbnail.schemas"
+    for S in $SCHEMAS; do
+      gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/$S > /dev/null || :
+    done
+fi
+ 
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -179,6 +188,9 @@ fi
 %{_libdir}/*so
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.1-2
+- Fix scripts to follow packaging guidelines
+
 * Thu Sep  7 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.1-1.fc6
 - Update to 2.16.1, including several improvements to 
   the mozilla plugin