Index: conf.c
===================================================================
--- conf.c	(revision 10713)
+++ conf.c	(working copy)
@@ -743,7 +743,7 @@
   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
 
 #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+  cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
 #endif /* HAVE_DNSSD || HAVE_AVAHI */
 
   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
Index: dirsvc.c
===================================================================
--- dirsvc.c	(revision 10713)
+++ dirsvc.c	(working copy)
@@ -206,9 +206,9 @@
 
       int fd = DNSServiceRefSockFD(DNSSDMaster);
 
-      fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+      //fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
 
-      cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
+      //cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
     }
 
 #  else /* HAVE_AVAHI */
@@ -620,7 +620,7 @@
     keyvalue[count++][1] = p->pc && p->pc->product ? p->pc->product : "Unknown";
 
     keyvalue[count  ][0] = "pdl";
-    keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
+    keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript,application/pdf";
 
     if (get_auth_info_required(p, air_str, sizeof(air_str)))
     {
@@ -704,6 +704,9 @@
 
     keyvalue[count  ][0] = "printer-type";
     keyvalue[count++][1] = type_str;
+
+    keyvalue[count  ][0] = "URF";
+    keyvalue[count++][1] = "none";
   }
 
  /*