diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..d074060
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,3 @@
+gvfs
+  post "%glib2_gio_module_post"
+  postun "%glib2_gio_module_postun"
diff --git a/gvfs.changes b/gvfs.changes
index a25a288..ce3f866 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul 22 16:31:25 CEST 2010 - vuntz@opensuse.org
+
+- Use %glib2_gio_module_* macros that have been added to glib2,
+  to make sure we always execute the right commands.
+- Add baselibs.conf.
+
 -------------------------------------------------------------------
 Mon Jun 21 12:48:22 CEST 2010 - dimstar@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index 2427f22..97d23eb 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -25,6 +25,7 @@ Summary:        VFS functionality for GLib
 Url:            http://www.gnome.org
 Group:          Development/Libraries/C and C++
 Source0:        %{name}-%{version}.tar.bz2
+Source99:       baselibs.conf
 # PATCH-FEATURE-OPENSUSE gvfs-dice-backend.patch hpj@suse.de -- Implements Novell IceDesktop backend. Should be upstreamed eventually.
 Patch1:         gvfs-dice-backend.patch
 # PATCH-FIX-UPSTREAM gvfs-429959-handle-blank-schemas.patch bnc429959 hpj@suse.de -- Fix URI handler lookup with blank schemas.
@@ -56,13 +57,11 @@ BuildRequires:  libgudev-1_0-devel
 %endif
 Requires:       %{name}-lang = %{version}
 Requires:       libgvfscommon0 = %{version}
-# we need gio-querymodules in %post/%postun
-Requires(post): glib2
-Requires(postun): glib2
 Recommends:     gvfs-backends
 Recommends:     gvfs-common
 Recommends:     gvfs-fuse
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%glib2_gio_module_requires
 
 %description
 VFS functionality for GLib.
@@ -144,18 +143,10 @@ chmod -x %{buildroot}%{_sysconfdir}/profile.d/*
 %find_lang %{name}
 
 %post
-%if "%{_lib}" == "lib64"
-  %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
-%else
-  %{_bindir}/gio-querymodules %{_libdir}/gio/modules
-%endif
+%glib2_gio_module_post
 
 %postun
-%if "%{_lib}" == "lib64"
-  %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules
-%else
-  %{_bindir}/gio-querymodules %{_libdir}/gio/modules
-%endif
+%glib2_gio_module_postun
 
 %post -n libgvfscommon0 -p /sbin/ldconfig