diff --git a/ChangeLog b/ChangeLog
index c4c3bfc2f..ca5b4dbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ver 0.14.0 (????/??/??)
 * New null audio output plugin
 * Zeroconf support using Bonjour
+* New zeroconf_enabled option so that Zeroconf support can be disabled
 
 ver 0.13.0 (2007/5/28)
 * New JACK audio output
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index c1625c527..d52f07200 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -72,12 +72,13 @@ reports from what address a connection is opened, and when it is closed, and
 default is "default".
 .TP
 .B zeroconf_enabled <yes or no>
-Specifies if zeroconf should be enabled or not.
+If yes, and MPD has been compiled with support for Avahi or Bonjour, service
+information will be published with Zeroconf.  The default is yes.
 .TP
 .B zeroconf_name <name>
-If Zerconf is compiled into MPD, this is the service name to publish.  This
-should be unique to your local network, but name collisions will be properly
-dealt with.
+If Zeroconf is enabled, this is the service name to publish.  This name should
+be unique to your local network, but name collisions will be properly dealt
+with.  The default is "Music Player".
 .TP
 .B password <password@permissions>
 This specifies a password for access to mpd.  The format is
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 3a657c7f6..bddc4d482 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -45,13 +45,17 @@ error_file                      "~/.mpd/mpd.error"
 #
 #log_level                       "default"
 #
-# If Zeroconf support should be enabled.
+################################################################
+
+
+########################### ZEROCONF ###########################
+#
+# If yes, service information will be published with Zeroconf.
 #
 #zeroconf_enabled                "yes"
 #
-# If Zeroconf is configured, the service name to publish.  This
-# should be unique on your local network, but name collisions
-# will be taken care of for you.
+# The service name to publish.  This name should be unique on
+# your local network.
 #
 #zeroconf_name                   "Music Player"
 #