diff --git a/.gitignore b/.gitignore
index 2516151..b308d2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 simple-scan-2.31.5.tar.bz2
+/simple-scan-2.31.90.1.tar.bz2
diff --git a/simple-scan.spec b/simple-scan.spec
index 9d57e2e..5df2c42 100644
--- a/simple-scan.spec
+++ b/simple-scan.spec
@@ -1,5 +1,5 @@
 Name:           simple-scan
-Version:        2.31.5
+Version:        2.31.90.1
 Release:        1%{?dist}
 Summary:        Simple scanning utility
 
@@ -34,26 +34,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name} --with-man --with-gnome
 
 %pre
-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 || :
-killall -HUP gconfd-2 || :
-fi
+%gconf_schema_prepare %{name}
 
 %post
-export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-gconftool-2 --makefile-install-rule \
-%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+%gconf_schema_upgrade %{name}
 
 %preun
-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 || :
-killall -HUP gconfd-2 || :
-fi
+%gconf_schema_remove %{name}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -65,6 +52,10 @@ fi
 %{_datadir}/simple-scan/
 
 %changelog
+* Mon Aug 16 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.90.1-1
+- Update to 2.31.90.1
+- Use GConf macros
+
 * Tue Jul 13 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.5-1
 - Update to 2.31.5
 
diff --git a/sources b/sources
index b8047cd..7c735e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db7349d31ec2d58ef96cb7b5c1484cd8  simple-scan-2.31.5.tar.bz2
+e237c361dea06510058891a79a282dca  simple-scan-2.31.90.1.tar.bz2