diff --git a/bluez.spec b/bluez.spec
index 718c489..77a9403 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.37
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -21,6 +21,8 @@ Patch4: bluez-socket-mobile-cf-connection-kit.patch
 Patch5: bluez-pass-removal-flag.patch
 # http://git.kernel.org/?p=bluetooth/bluez.git;a=commitdiff;h=8ca76f2e9cf85ff39adc8bfa68627b8c4d9512cc
 Patch6: bluez-no-unplug-on-disconnect.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=507572
+Patch7: cups-less-errors.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.bluez.org/
@@ -112,6 +114,7 @@ use in Bluetooth applications.
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .removal
 %patch6 -p1 -b .unplug
+%patch7 -p1 -b .cups-less-errors
 
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
@@ -205,6 +208,10 @@ fi
 %{_sysconfdir}/alsa/bluetooth.conf
 
 %changelog
+* Wed Jun 24 2009 Bastien Nocera <bnocera@redhat.com> 4.37-4
+- Reduce the number of errors from CUPS when bluetoothd
+  isn't running, or there's no adapters (#507572)
+
 * Fri May 08 2009 Bastien Nocera <bnocera@redhat.com> 4.37-3
 - Hopefully fix HID device not reconnecting properly after
   they've been disconnected (#485927)
diff --git a/cups-less-errors.patch b/cups-less-errors.patch
new file mode 100644
index 0000000..db1cbce
--- /dev/null
+++ b/cups-less-errors.patch
@@ -0,0 +1,33 @@
+diff --git a/cups/main.c b/cups/main.c
+index 6dcc622..2fbfe7e 100644
+--- a/cups/main.c
++++ b/cups/main.c
+@@ -536,15 +536,15 @@ static gboolean list_printers(void)
+ 
+ 	conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NULL, NULL);
+ 	if (conn == NULL)
+-		return FALSE;
++		return TRUE;
+ 
+ 	dbus_error_init(&error);
+ 	hcid_exists = dbus_bus_name_has_owner(conn, "org.bluez", &error);
+ 	if (&error != NULL && dbus_error_is_set(&error))
+-		return FALSE;
++		return TRUE;
+ 
+ 	if (!hcid_exists)
+-		return FALSE;
++		return TRUE;
+ 
+ 	/* Get the default adapter */
+ 	message = dbus_message_new_method_call("org.bluez", "/",
+@@ -562,7 +562,8 @@ static gboolean list_printers(void)
+ 
+ 	if (&error != NULL && dbus_error_is_set(&error)) {
+ 		dbus_connection_unref(conn);
+-		return FALSE;
++		/* No adapter */
++		return TRUE;
+ 	}
+ 
+ 	dbus_message_iter_init(reply, &reply_iter);