diff --git a/gtkhash.spec b/gtkhash.spec
index 465f994..400a40c 100644
--- a/gtkhash.spec
+++ b/gtkhash.spec
@@ -1,3 +1,5 @@
+# Review at https://bugzilla.redhat.com/show_bug.cgi?id=540328
+#
 # by default build nautilus extension
 # use with to change the default
 %bcond_without nautilus
@@ -16,8 +18,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel mhash-devel
 BuildRequires:  desktop-file-utils gettext intltool
-# for the nautilis extension
+%if %{with nautilus}
 BuildRequires:  GConf2-devel nautilus-devel
+%endif
 
 %description
 GtkHash is a GTK+ utility for computing message digests or checksums using the
@@ -71,25 +74,15 @@ rm -rf %{buildroot}
 
 %if %{with nautilus}
 %pre nautilus
-if [ "$1" -gt 1 ] ; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-fi
+%gconf_schema_prepare %{name}
 
 
 %post nautilus
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+%gconf_schema_upgrade %{name}
 
 
 %preun nautilus
-if [ "$1" -eq 0 ] ; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-fi
+%gconf_schema_remove %{name}
 %endif