diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index d1bc3ddda75d305a1c6d51a770b19af21caf1c78..2f0e1be7df9ca7d216c4aa5cc1245f6f9b330a18 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -470,8 +470,12 @@ static int daemonSetupNetworking(virNetServerPtr srv,
                                              NULL)))
         goto error;
 
-    if (virNetServerAddService(srv, svc, NULL) < 0)
+    if (virNetServerAddService(srv, svc,
+                               config->mdns_adv && !ipsock ?
+                               "_libvirt._tcp" :
+                               NULL) < 0)
         goto error;
+
     if (svcRO &&
         virNetServerAddService(srv, svcRO, NULL) < 0)
         goto error;