diff --git a/gvfs.changes b/gvfs.changes
index f73e4d6..67ae96b 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 29 02:18:10 CET 2008 - jpr@suse.de
+
+- Move the gio modules into the main package (#358748)
+- Enable gconf backend
+
 -------------------------------------------------------------------
 Mon Feb 18 18:25:03 CET 2008 - maw@suse.de
 
diff --git a/gvfs.spec b/gvfs.spec
index c4b5691..3a0100b 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -12,7 +12,7 @@
 
 
 Name:           gvfs
-BuildRequires:  dbus-1-devel fuse-devel glib2-devel hal-devel intltool libsmbclient-devel libsoup-devel pkg-config
+BuildRequires:  dbus-1-devel fuse-devel gconf2-devel glib2-devel hal-devel intltool libsmbclient-devel libsoup-devel pkg-config
 %if %suse_version <= 1020
 %define _prefix   /opt/gnome
 %define _sysconfdir /etc/%_prefix
@@ -20,7 +20,7 @@ BuildRequires:  extra-rpm-macros
 %endif
 Summary:        VFS functionality for GLib
 Version:        0.1.7
-Release:        1
+Release:        5
 License:        LGPL v2.0 or later
 Group:          Development/Libraries/C and C++
 Source0:        %{name}-%{version}.tar.bz2
@@ -61,11 +61,12 @@ Authors:
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure \
     --libexecdir=%{_libdir}/%{name}
-make
+%__make
 
 %install
 %makeinstall
 rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
+rm $RPM_BUILD_ROOT/%{_libdir}/gio/modules/*.*a
 %find_lang %{name}
 
 %post -p /sbin/ldconfig
@@ -82,18 +83,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/gvfs
 %{_libdir}/gvfs
+%{_libdir}/gio
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/gvfs-client
-%{_libdir}/gio
 # %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 
 %files lang -f %{name}.lang
 
 %changelog
+* Fri Feb 29 2008 jpr@suse.de
+- Move the gio modules into the main package (#358748)
+- Enable gconf backend
 * Mon Feb 18 2008 maw@suse.de
 - Update to version 0.1.7:
   + Update for gio API changes