--- old/cups-1.6.1/scheduler/dirsvc.c	2012-12-13 17:55:07.000000000 +0100
+++ new/cups-1.6.1/scheduler/dirsvc.c	2012-12-08 00:30:19.836524123 +0100
@@ -1436,8 +1436,10 @@
 #  ifdef HAVE_AVAHI
   if (DNSSDClient)
   {
+    avahi_threaded_poll_lock(DNSSDMaster);
     const char	*host_name = avahi_client_get_host_name(DNSSDClient);
     const char	*host_fqdn = avahi_client_get_host_name_fqdn(DNSSDClient);
+    avahi_threaded_poll_unlock(DNSSDMaster);
 
     cupsdSetString(&DNSSDComputerName, host_name ? host_name : ServerName);