47ca1c
diff -up cups-1.6b1/backend/dnssd.c.dnssd-deviceid cups-1.6b1/backend/dnssd.c
47ca1c
--- cups-1.6b1/backend/dnssd.c.dnssd-deviceid	2012-05-21 18:05:58.000000000 +0200
47ca1c
+++ cups-1.6b1/backend/dnssd.c	2012-05-25 16:27:49.226874427 +0200
47ca1c
@@ -1181,15 +1181,22 @@ query_callback(
47ca1c
   if (device->device_id)
47ca1c
     free(device->device_id);
f0558c
 
47ca1c
+  if (device_id[0])
47ca1c
+  {
47ca1c
+    /* Mark this as the real device ID. */
47ca1c
+    ptr = device_id + strlen(device_id);
47ca1c
+    snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;");
47ca1c
+  }
f0558c
+
47ca1c
   if (!device_id[0] && strcmp(model, "Unknown"))
47ca1c
   {
47ca1c
     if (make_and_model[0])
47ca1c
-      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;",
47ca1c
+      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
47ca1c
 	       make_and_model, model);
47ca1c
     else if (!_cups_strncasecmp(model, "designjet ", 10))
47ca1c
-      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10);
47ca1c
+      snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10);
47ca1c
     else if (!_cups_strncasecmp(model, "stylus ", 7))
47ca1c
-      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7);
47ca1c
+      snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7);
47ca1c
     else if ((ptr = strchr(model, ' ')) != NULL)
47ca1c
     {
47ca1c
      /*
47ca1c
@@ -1199,7 +1206,7 @@ query_callback(
47ca1c
       memcpy(make_and_model, model, ptr - model);
47ca1c
       make_and_model[ptr - model] = '\0';
f0558c
 
47ca1c
-      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s",
47ca1c
+      snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;",
47ca1c
 	       make_and_model, ptr + 1);
47ca1c
     }
47ca1c
   }