diff --git a/gvfs.spec b/gvfs.spec
index 233085c..25fccbd 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,13 +1,13 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 Source: http://download.gnome.org/sources/gvfs/1.6/gvfs-%{version}.tar.bz2
 BuildRequires: pkgconfig
-BuildRequires: glib2-devel >= 2.23.2
+BuildRequires: glib2-devel >= 2.25.1-2
 BuildRequires: dbus-glib-devel
 BuildRequires: /usr/bin/ssh
 BuildRequires: libcdio-devel >= 0.78.2
@@ -164,29 +164,15 @@ rm -rf $RPM_BUILD_ROOT
 # Reload .mount files:
 killall -USR1 gvfsd >&/dev/null || :
 # Update desktop files mime mappings:
-update-desktop-database &> /dev/null ||:
-case "$host" in
-  alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
-    %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
-    ;;
-  *)
-    %{_bindir}/gio-querymodules-32 %{_libdir}/gio/modules
-    ;;
-esac
+update-desktop-database &> /dev/null || :
+update-gio-modules "$host" &> /dev/null || :
 
 
 %postun
 /sbin/ldconfig
 # Update desktop files mime mappings:
 update-desktop-database &> /dev/null ||:
-case "$host" in
-  alpha*|ia64*|powerpc64*|ppc64*|s390x*|sparc64*|x86_64*)
-    %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
-    ;;
-  *)
-    %{_bindir}/gio-querymodules-32 %{_libdir}/gio/modules
-    ;;
-esac
+update-gio-modules "$host" &> /dev/null || :
 
 
 # Reload .mount files when single subpackage is installed:
@@ -313,6 +299,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
+* Mon Apr 19 2010 Matthias Clasen <mclasen@redhat.com> - 1.6.0-2
+- Use update-gio-modules
+
 * Mon Mar 29 2010 Tomas Bzatek <tbzatek@redhat.com> - 1.6.0-1
 - Update to 1.6.0