Index: libvirt-0.9.4/daemon/libvirtd.conf
===================================================================
--- libvirt-0.9.4.orig/daemon/libvirtd.conf
+++ libvirt-0.9.4/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
 # It is necessary to setup a CA and issue server certificates before
 # using this capability.
 #
-# This is enabled by default, uncomment this to disable it
-#listen_tls = 0
+# This is disabled by default, uncomment this to enable it
+#listen_tls = 1
 
 # Listen for unencrypted TCP connections on the public TCP/IP port.
 # NB, must pass the --listen flag to the libvirtd process for this to
@@ -53,11 +53,9 @@
 
 # Flag toggling mDNS advertizement of the libvirt service.
 #
-# Alternatively can disable for all services on a host by
-# stopping the Avahi daemon
-#
-# This is enabled by default, uncomment this to disable it
-#mdns_adv = 0
+# Disabled by default.  To enable, ensure the Avahi daemon is
+# running and uncomment this flag.
+#mdns_adv = 1
 
 # Override the default mDNS advertizement name. This must be
 # unique on the immediate broadcast network.
Index: libvirt-0.9.4/daemon/libvirtd.c
===================================================================
--- libvirt-0.9.4.orig/daemon/libvirtd.c
+++ libvirt-0.9.4/daemon/libvirtd.c
@@ -881,7 +881,7 @@ daemonConfigNew(bool privileged ATTRIBUT
         return NULL;
     }
 
-    data->listen_tls = 1;
+    data->listen_tls = 0;
     data->listen_tcp = 0;
 
     if (!(data->tls_port = strdup(LIBVIRTD_TLS_PORT)))
@@ -918,7 +918,7 @@ daemonConfigNew(bool privileged ATTRIBUT
 #endif
     data->auth_tls = REMOTE_AUTH_NONE;
 
-    data->mdns_adv = 1;
+    data->mdns_adv = 0;
 
     data->min_workers = 5;
     data->max_workers = 20;