diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 28b65a0..f4d20e3 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.16.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -23,6 +23,7 @@ Requires:      gnome-mime-data >= %{gnome_mime_data_version}
 Requires:      shared-mime-info
 Requires:      gnome-mount >= %{gnome_mount_version}
 Requires(post): GConf2 >= %{gconf2_version}
+Requires(pre): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 BuildRequires: GConf2-devel >= %{gconf2_version}
 BuildRequires: gnome-mime-data >= %{gnome_mime_data_version}
@@ -170,18 +171,29 @@ gconftool-2 --makefile-install-rule \
     %{_sysconfdir}/gconf/schemas/system_dns_sd.schemas \
     %{_sysconfdir}/gconf/schemas/system_smb.schemas \
     %{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas \
-    %{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_default_applications.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/system_http_proxy.schemas \
+    %{_sysconfdir}/gconf/schemas/system_dns_sd.schemas \
+    %{_sysconfdir}/gconf/schemas/system_smb.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas \ 
       > /dev/null || :
 
 %preun
-if [ "$1" -gt 0 ]; then
+if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/system_http_proxy.schemas \
     %{_sysconfdir}/gconf/schemas/system_dns_sd.schemas \
     %{_sysconfdir}/gconf/schemas/system_smb.schemas \
     %{_sysconfdir}/gconf/schemas/desktop_gnome_url_handlers.schemas \
-    %{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas \
+    %{_sysconfdir}/gconf/schemas/desktop_default_applications.schemas \ 
       > /dev/null || :
 fi
 
@@ -221,6 +233,9 @@ fi
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-6
+- Fix scripts according to packaging guidelines
+
 * Tue Oct 17 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-5
 - Tighten up Requires (#203813)
 - Require pkgconfig in the -devel package
@@ -928,3 +943,4 @@ fi
 
 * Tue Feb 22 2000 Ross Golder <rossigee@bigfoot.com>
 - Integrate into source tree
+  gconftool-2 --makefile-install-rule \