diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index 27881138..f669d6bc 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -1,10 +1,4 @@
 <icecast>
-    <!-- location and admin are two arbitrary strings that are e.g. visible
-         on the server info page of the icecast web interface
-         (server_version.xsl). -->
-    <location>Earth</location>
-    <admin>icemaster@localhost</admin>
-
     <!-- IMPORTANT!
          Especially for inexperienced users:
          Start out by ONLY changing all passwords and restarting Icecast.
@@ -12,6 +6,12 @@
          It's also available here: http://icecast.org/docs/
     -->
 
+    <!-- location and admin are two strings that are e.g. visible
+	 on the server info page of the icecast web interface -->
+    <location>Earth</location>
+    <!-- If you are listing streams on a YP, this MUST be a working email! -->
+    <admin>icemaster@localhost</admin>
+
     <limits>
         <clients>100</clients>
         <sources>2</sources>
@@ -62,8 +62,9 @@
     -->
 
     <!-- This is the hostname other people will use to connect to your server.
-         It affects mainly the urls generated by Icecast for playlists and yp
+         It affects mainly the urls generated by Icecast for playlists and YP
          listings. You MUST configure it properly for YP listings to work!
+         This is NOT your homepage address, it's the hostname for THIS server.
     -->
     <hostname>localhost</hostname>
 
@@ -108,7 +109,7 @@
     <!--<master-update-interval>120</master-update-interval>-->
     <!--<master-password>hackme</master-password>-->
 
-    <!-- setting this makes all relays on-demand unless overridden, this is
+    <!-- Setting this makes all relays on-demand unless overridden, this is
          useful for master relays which do not have <relay> definitions here.
          The default is 0 -->
     <!--<relays-on-demand>1</relays-on-demand>-->
@@ -128,7 +129,9 @@
 
     <!-- Mountpoints
          Only define <mount> sections if you want to use advanced options,
-         like alternative usernames or passwords
+	 like alternative usernames or passwords
+         All <mount> sections below are disabled by default,
+         to activate them remove the comment markers around them and restart.
     -->
 
     <!-- Default settings for all mounts that don't have a specific <mount type="normal">.
@@ -197,7 +200,7 @@
         <!-- basedir is only used if chroot is enabled -->
         <basedir>@pkgdatadir@</basedir>
 
-        <!-- Note that if <chroot> is turned on below, these paths must both
+        <!-- Note that if <chroot> is turned on below, these paths must all
              be relative to the new root, not the original root -->
         <logdir>@localstatedir@/log/@PACKAGE@</logdir>
         <webroot>@pkgdatadir@/web</webroot>