diff --git a/gvfs.changes b/gvfs.changes
index 5e3bf82..5e64b75 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 10 11:09:26 CET 2011 - vuntz@opensuse.org
+
+- Move gvfsd-metadata daemon to the main gvfs package, and ship
+  dbus .service files with their appropriate daemons, to avoid
+  declaring a dbus service if the binary is not installed.
+
 -------------------------------------------------------------------
 Thu Jan 13 18:31:47 CET 2011 - hpj@novell.com
 
diff --git a/gvfs.spec b/gvfs.spec
index a3099ab..47d7ed2 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gvfs (Version 1.6.6)
+# spec file for package gvfs
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 
 Name:           gvfs
 Version:        1.6.6
-Release:        2
+Release:        3
 License:        LGPLv2.0+
 Summary:        VFS functionality for GLib
 Url:            http://www.gnome.org
@@ -162,13 +162,15 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %doc AUTHORS NEWS README TODO
 %{_bindir}/*
-%{_datadir}/dbus-1/services/*.service
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/mounts
 %dir %{_datadir}/%{name}/remote-volume-monitors
 %{_libdir}/gio/modules/*.so
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/gvfsd
+%{_datadir}/dbus-1/services/gvfs-daemon.service
+%{_libexecdir}/%{name}/gvfsd-metadata
+%{_datadir}/dbus-1/services/gvfs-metadata.service
 %{_sysconfdir}/profile.d/*
 
 %files fuse
@@ -178,6 +180,7 @@ rm -rf %{buildroot}
 %files backend-afc
 %defattr(-, root, root)
 %{_libexecdir}/%{name}/gvfs-afc-volume-monitor
+%{_datadir}/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
 %{_datadir}/%{name}/remote-volume-monitors/afc.monitor
 %{_libexecdir}/%{name}/gvfsd-afc
 %{_datadir}/%{name}/mounts/afc.mount
@@ -186,9 +189,11 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %if %suse_version > 1110
 %{_libexecdir}/%{name}/gvfs-gdu-volume-monitor
+%{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service
 %{_datadir}/%{name}/remote-volume-monitors/gdu.monitor
 %endif
 %{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor
+%{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor
 %{_libexecdir}/%{name}/gvfsd-archive
 %{_datadir}/%{name}/mounts/archive.mount
@@ -213,7 +218,6 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/mounts/http.mount
 %{_libexecdir}/%{name}/gvfsd-localtest
 %{_datadir}/%{name}/mounts/localtest.mount
-%{_libexecdir}/%{name}/gvfsd-metadata
 %{_libexecdir}/%{name}/gvfsd-nds
 %{_datadir}/%{name}/mounts/nds.mount
 %{_libexecdir}/%{name}/gvfsd-network