Index: libvirt-0.8.6/daemon/libvirtd.conf
===================================================================
--- libvirt-0.8.6.orig/daemon/libvirtd.conf
+++ libvirt-0.8.6/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.8.6/daemon/libvirtd.c
===================================================================
--- libvirt-0.8.6.orig/daemon/libvirtd.c
+++ libvirt-0.8.6/daemon/libvirtd.c
@@ -147,7 +147,7 @@ static int sigwrite = -1;       /* Signa
 static int ipsock = 0;          /* -l  Listen for TCP/IP */
 
 /* Defaults for configuration file elements */
-static int listen_tls = 1;
+static int listen_tls = 0;
 static int listen_tcp = 0;
 static char *listen_addr  = (char *) LIBVIRTD_LISTEN_ADDR;
 static char *tls_port = (char *) LIBVIRTD_TLS_PORT;
@@ -169,7 +169,7 @@ static int auth_tcp = REMOTE_AUTH_NONE;
 #endif
 static int auth_tls = REMOTE_AUTH_NONE;
 
-static int mdns_adv = 1;
+static int mdns_adv = 0;
 static char *mdns_name = NULL;
 
 static int tls_no_verify_certificate = 0;