diff --git a/yelp.spec b/yelp.spec
index c2f4412..8d3d9e1 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.16.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -39,6 +39,7 @@ Requires: libglade2 >= %{libglade_version}
 Requires: libgcrypt
 Requires: gnome-doc-utils 
 Requires: scrollkeeper
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(post): desktop-file-utils
 Requires(preun): GConf2
@@ -107,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null || :
 update-desktop-database &> /dev/null ||:
 
 # update icon themes
@@ -116,9 +117,17 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null || :
+fi
+
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null || :
+fi
 
 %postun
 update-desktop-database &> /dev/null ||:
@@ -132,6 +141,9 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/yelp
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-5
+- Fix scripts according to the packaging guidelines
+
 * Thu Oct 12 2006 Christopher Aillon <caillon@redhat.com> - 2.16.0-4.fc6
 - Update requires to the virtual gecko version instead of a specific app