diff --git a/gedit.spec b/gedit.spec
index 8ad8f01..aa574f4 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -12,13 +12,14 @@
 %define pygobject_version 2.11.5
 %define gnome_python_desktop_version 2.15.90
 %define gnome_doc_utils_version 0.3.2
+%define gconf_version 2.14
 
 %define po_package gedit
 
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.16.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:		1
 License:	GPL
 Group:		Applications/Editors
@@ -29,8 +30,9 @@ BuildRoot:	%{_tmppath}/gedit-%{version}-root
 
 Requires(post):         desktop-file-utils >= %{desktop_file_utils_version}
 Requires(post):		scrollkeeper >= 0.1.4
-Requires(post):		GConf2
-Requires(preun):	GConf2
+Requires(post):		GConf2 >= %{gconf_version}
+Requires(pre):		GConf2 >= %{gconf_version}
+Requires(preun):	GConf2 >= %{gconf_version}
 Requires(postun):	scrollkeeper >= 0.1.4
 Requires(postun):       desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -147,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 update-desktop-database -q
 scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
 
 # update icon themes
 touch %{_datadir}/icons/hicolor
@@ -155,6 +157,13 @@ 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`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gedit.schemas > /dev/null || :
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -190,6 +199,9 @@ fi
 %{_datadir}/gtk-doc/html/gedit/
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0-4
+- Fix scripts according to packaging guidelines
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0-3
 - Fix directory ownership issues (#205675)