diff --git a/gnome-vfs-2.16.0-no-dbus.patch b/gnome-vfs-2.16.0-no-dbus.patch
new file mode 100644
index 0000000..371c052
--- /dev/null
+++ b/gnome-vfs-2.16.0-no-dbus.patch
@@ -0,0 +1,22 @@
+--- gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c.no-dbus	2006-09-19 13:36:28.000000000 -0400
++++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-19 13:37:11.000000000 -0400
+@@ -201,6 +201,9 @@
+ 
+ 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
+ 
++	if (volume_monitor_client->dbus_conn == NULL)
++		return;
++
+ 	list = get_drives (volume_monitor_client->dbus_conn, volume_monitor);
+ 	for (l = list; l; l = l->next) {
+ 		drive = l->data;
+@@ -221,6 +224,9 @@
+ 
+ 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
+ 
++	if (volume_monitor_client->dbus_conn == NULL)
++		return;
++
+ 	list = get_volumes (volume_monitor_client->dbus_conn, volume_monitor);
+ 	for (l = list; l; l = l->next) {
+ 		volume = l->data;
diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index 9aae5f9..76cd5b5 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -13,7 +13,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.16.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: gnome-vfs-%{version}.tar.bz2
@@ -64,6 +64,9 @@ Patch6: gnome-vfs-2.15.91-mailto-command.patch
 
 Patch7: gnome-vfs-2.16.0-cvs-backport.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=356772
+Patch8: gnome-vfs-2.16.0-no-dbus.patch
+
 
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
@@ -115,6 +118,7 @@ shares (SMB) to applications using GNOME VFS.
 %patch201 -p0 -b .console
 
 %patch7 -p0 -b .cvs-backport
+%patch8 -p1 -b .no-dbus
 
 %build
 
@@ -132,6 +136,7 @@ automake-1.9 --add-missing
 
 #needed for patch 102 (kerberos fix)
 autoconf
+CFLAGS="-O0 -g"
 %configure --disable-gtk-doc --with-gtk=no --enable-hal 
 
 export tagname=CC
@@ -200,6 +205,9 @@ done
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Tue Sep 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-3
+- Prevent excessive warnings when dbus is not available (#207121)
+
 * Tue Sep 19 2006 Alexander Larsson <alexl@redhat.com> - 2.16.0-2
 - Backport fixes from cvs:
 -  Fix crash on shutdown (gnome bug 347470)