diff -up cups-1.5b1/backend/dnssd.c.dnssd-deviceid cups-1.5b1/backend/dnssd.c

--- cups-1.5b1/backend/dnssd.c.dnssd-deviceid	2011-05-20 05:49:49.000000000 +0200

+++ cups-1.5b1/backend/dnssd.c	2011-05-24 17:28:18.000000000 +0200

@@ -817,15 +817,22 @@ query_callback(

       if (device->device_id)

         free(device->device_id);

+      if (device_id[0])

+      {

+	  /* Mark this as the real device ID. */

+	  ptr = device_id + strlen(device_id);

+	  snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");

+      }

+

       if (!device_id[0] && strcmp(model, "Unknown"))

       {

         if (make_and_model[0])

-	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",

+	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",

 	           make_and_model, model);

         else if (!_cups_strncasecmp(model, "designjet ", 10))

-	  snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);

+	  snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);

         else if (!_cups_strncasecmp(model, "stylus ", 7))

-	  snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);

+	  snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);

         else if ((ptr = strchr(model, ' ')) != NULL)

 	{

 	 /*

@@ -835,7 +842,7 @@ query_callback(

           memcpy(make_and_model, model, ptr - model);

 	  make_and_model[ptr - model] = '\0';

-	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",

+	  snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",

 		   make_and_model, ptr + 1);

         }

       }