Index: general.ent
===================================================================
--- general.ent	(revision aea8938860a722cccab78e5376278ea68d31157c)
+++ general.ent	(revision 79d9ab52d3d3fc8021502f51e523dc961b127ad9)
@@ -485,5 +485,5 @@
 <!ENTITY bind-version                 "9.8.1-P1">
 <!ENTITY wireshark-version            "0.99.6">
-<!ENTITY avahi-version                "0.6.25">
+<!ENTITY avahi-version                "0.6.28">
 <!ENTITY mod_dnssd-version            "0.6">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision aea8938860a722cccab78e5376278ea68d31157c)
+++ introduction/welcome/changelog.xml	(revision 79d9ab52d3d3fc8021502f51e523dc961b127ad9)
@@ -57,4 +57,7 @@
           <para>[ken] - add cogl-1.8.2 from Wayne.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - update to avahi-0.6.28 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision aea8938860a722cccab78e5376278ea68d31157c)
+++ networking/netutils/avahi.xml	(revision 79d9ab52d3d3fc8021502f51e523dc961b127ad9)
@@ -7,8 +7,8 @@
   <!ENTITY avahi-download-http "http://avahi.org/download/avahi-&avahi-version;.tar.gz">
   <!ENTITY avahi-download-ftp  " ">
-  <!ENTITY avahi-md5sum        "a83155a6e29e3988f07e5eea3287b21e">
-  <!ENTITY avahi-size          "1.1 MB">
-  <!ENTITY avahi-buildsize     "27 MB">
-  <!ENTITY avahi-time          "0.6 SBU">
+  <!ENTITY avahi-md5sum        "d0143a5aa3265019072e53ab497818d0">
+  <!ENTITY avahi-size          "1.2 MB">
+  <!ENTITY avahi-buildsize     "41 MB">
+  <!ENTITY avahi-time          "0.4 SBU">
 ]>
 
@@ -33,5 +33,5 @@
     facilitates service discovery on a local network.</para>
 
-    &lfs65_built;
+    &lfs68_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57,5 +57,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!--<bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -63,5 +63,5 @@
         url="&patch-root;/avahi-&avahi-version;-lfs_initscript_fixes-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist>-->
 
     <bridgehead renderas="sect3">avahi Dependencies</bridgehead>
@@ -73,5 +73,7 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="dbus-python"/>,
+    <xref linkend="gobject-introspection"/>,
     <xref linkend="gtk2"/>,
+    <xref linkend="gtk3"/>,
     <xref linkend="libdaemon"/>,
     <xref linkend="libglade"/>,
@@ -107,19 +109,19 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../avahi-&avahi-version;-lfs_initscript_fixes-1.patch &amp;&amp;
-autoreconf -i -v &amp;&amp;
-./configure --prefix=/usr \
+<screen><userinput><!--patch -Np1 -i ../avahi-&avahi-version;-lfs_initscript_fixes-1.patch &amp;&amp;
+autoreconf -i -v &amp;&amp;-->./configure --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --with-distro=lfs \
+            --disable-gtk \
+            --disable-gtk3 \
             --disable-qt3 \
             --disable-qt4 \
-            --disable-gtk \
+            --disable-mono \
+            --disable-monodoc \
+            --disable-python \
             --disable-dbus \
             --disable-libdaemon \
-            --disable-python \
-            --disable-mono \
-            --disable-monodoc \
-            --enable-core-docs &amp;&amp;
+            --enable-core-docs \
+            --with-distro=none &amp;&amp;
 make</userinput></screen>
 
@@ -135,6 +137,9 @@
     <title>Command Explanations</title>
 
-    <para><parameter>--with-distro=lfs</parameter>: This parameter specifies the
-    LFS distribution to target.</para>
+    <para><parameter>--disable-gtk</parameter>: This parameter disables the use
+    of <application>GTK+2</application>.</para>
+
+    <para><parameter>--disable-gtk3</parameter>: This parameter disables the use
+    of <application>GTK+3</application>.</para>
 
     <para><parameter>--disable-qt3</parameter>: This parameter disables the
@@ -144,6 +149,12 @@
     building of <application>Qt4Core</application> mainloop integration.</para>
 
-    <para><parameter>--disable-gtk</parameter>: This parameter disables the use
-    of <application>GTK+</application>.</para>
+    <para><parameter>--disable-mono</parameter>: This parameter disables the
+    <application>Mono</application> bindings.</para>
+
+    <para><parameter>--disable-monodoc</parameter>: This parameter disables
+    documentation for the <application>Mono</application> bindings.</para>
+
+    <para><parameter>--disable-python</parameter>: This parameter disables the
+    scripts that depends on <application>Python</application>.</para>
 
     <para><parameter>--disable-dbus</parameter>: This parameter disables the use
@@ -153,24 +164,40 @@
     the use of libdaemon.</para>
 
-    <para><parameter>--disable-python</parameter>: This parameter disables the
-    scripts that depends on <application>Python</application>.</para>
-
-    <para><parameter>--disable-mono</parameter>: This parameter disables the
-    <application>Mono</application> bindings.</para>
-
-    <para><parameter>--disable-monodoc</parameter>: This parameter disables
-    documentation for the <application>Mono</application> bindings.</para>
-
     <para><parameter>--enable-core-docs</parameter>: This parameter enables the
     building of documentation.</para>
 
+    <para><parameter>--with-distro=none</parameter>: This parameter specifies the
+    LFS distribution to target.</para>
+
     <para><option>--enable-tests</option>: This option enables the building of
     tests and examples.</para>
 
+    <para><option>--enable-compat-howl</option>: This option enables the
+    compatibility layer for <application>HOWL</application>.</para>
+
     <para><option>--enable-compat-libdns_sd</option>: This option enables the
     compatibility layer for <application>libdns_sd</application>.</para>
 
-    <para><option>--enable-compat-howl</option>: This option enables the
-    compatibility layer for <application>HOWL</application>.</para>
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring avahi</title>
+
+    <sect3  id="avahi-init">
+      <title>Boot Script</title>
+
+      <para>To automatically start the <command>avahi</command> daemon
+      when the system is rebooted, install the
+      <filename>/etc/rc.d/init.d/avahi</filename>
+      bootscript from the
+      <xref linkend="bootscripts"/> package.</para>
+
+      <indexterm zone="avahi avahi-init">
+        <primary sortas="f-avahi">avahi</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-avahi</userinput></screen>
+
+    </sect3>
 
   </sect2>
@@ -185,13 +212,18 @@
 
       <seglistitem>
-        <seg>avahi-autoipd, avahi-bookmarks, avahi-browse, avahi-daemon,
-        avahi-discover, avahi-discover-standalone, avahi-dnsconfd,
-        avahi-publish, avahi-resolve, avahi-set-host-name, and bssh</seg>
+        <seg>avahi-autoipd, avahi-bookmarks, avahi-browse, avahi-browse-domains,
+        avahi-daemon, avahi-discover, avahi-discover-standalone, avahi-dnsconfd,
+        avahi-publish, avahi-publish-address, avahi-publish-service,
+        avahi-resolve, avahi-resolve-address, avahi-resolve-host-name,
+        avahi-set-host-name, bshell, bssh, and bvnc</seg>
         <seg>libavahi-client.{so,a}, libavahi-common.{so,a},
-        libavahi-core.{so,a}, libavahi-glib.{so,a}, libavahi-gobject.{so,a}, and
-        libavahi-ui.{so,a}</seg>
-        <seg>/etc/avahi/services,/usr/{include/avahi-{client,common,core,glib,
-        gobject,ui},lib/{avahi,python&python2-majorver;/site-packages/{avahi,avahi_discover}},
-        share/avahi/{interfaces,introspection}}</seg>
+        libavahi-core.{so,a}, libavahi-glib.{so,a}, libavahi-gobject.{so,a},
+        libavahi-ui-gtk3.{so,a}, libavahi-ui.{so,a}, libdns_sd.{so,a}, and
+        libhowl.{so,a}</seg>
+        <seg>/etc/avahi/services, /usr/{include/{avahi-client,avahi-common,
+        avahi-compat-howl/{corby,discovery,rendezvous,salt},
+        avahi-compat-libdns_sd,avahi-core,avahi-glib,avahi-gobject,avahi-ui},
+        lib/{avahi,python&python2-majorver;/site-packages/{avahi,
+        avahi_discover}},share/{avahi/interfaces,locale/en_NZ/LC_MESSAGES}}</seg>
       </seglistitem>
     </segmentedlist>
@@ -234,4 +266,15 @@
       </varlistentry>
 
+      <varlistentry id="avahi-browse-domains">
+        <term><command>avahi-browse-domains</command></term>
+        <listitem>
+          <para>browses for mDNS/DNS-SD services using the
+          <application>Avahi</application> daemon.</para>
+          <indexterm zone="avahi avahi-browse-domains">
+            <primary sortas="b-avahi-browse-domains">avahi-browse-domains</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="avahi-daemon">
         <term><command>avahi-daemon</command></term>
@@ -259,5 +302,6 @@
         <term><command>avahi-discover-standalone</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>browses for mDNS/DNS-SD services using the
+          <application>Avahi</application> daemon.</para>
           <indexterm zone="avahi avahi-discover-standalone">
             <primary sortas="b-avahi-discover-standalone">avahi-discover-standalone</primary>
@@ -284,4 +328,26 @@
           <indexterm zone="avahi avahi-publish">
             <primary sortas="b-avahi-publish">avahi-publish</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="avahi-publish-address">
+        <term><command>avahi-publish-address</command></term>
+        <listitem>
+          <para>registers a mDNS/DNS-SD service or host name or address mapping
+          using the <application>Avahi</application> daemon.</para>
+          <indexterm zone="avahi avahi-publish-address">
+            <primary sortas="b-avahi-publish-address">avahi-publish-address</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="avahi-publish-service">
+        <term><command>avahi-publish-service</command></term>
+        <listitem>
+          <para>registers a mDNS/DNS-SD service or host name or address mapping
+          using the <application>Avahi</application> daemon.</para>
+          <indexterm zone="avahi avahi-publish-service">
+            <primary sortas="b-avahi-publish-service">avahi-publish-service</primary>
           </indexterm>
         </listitem>
@@ -300,4 +366,28 @@
       </varlistentry>
 
+      <varlistentry id="avahi-resolve-address">
+        <term><command>avahi-resolve-address</command></term>
+        <listitem>
+          <para>resolves one or more mDNS/DNS host name(s) to IP address(es)
+          (and vice versa) using the <application>Avahi</application>
+          daemon.</para>
+          <indexterm zone="avahi avahi-resolve-address">
+            <primary sortas="b-avahi-resolve-address">avahi-resolve-address</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="avahi-resolve-host-name">
+        <term><command>avahi-resolve-host-name</command></term>
+        <listitem>
+          <para>resolves one or more mDNS/DNS host name(s) to IP address(es)
+          (and vice versa) using the <application>Avahi</application>
+          daemon.</para>
+          <indexterm zone="avahi avahi-resolve-host-name">
+            <primary sortas="b-avahi-resolve-host-name">avahi-resolve-host-name</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="avahi-set-host-name">
         <term><command>avahi-set-host-name</command></term>
@@ -310,8 +400,18 @@
       </varlistentry>
 
+      <!--<varlistentry id="bshell">
+        <term><command>bshell</command></term>
+        <listitem>
+          <para>does this .....</para>
+          <indexterm zone="avahi bshell">
+            <primary sortas="b-bshell">bshell</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>-->
+
       <varlistentry id="bssh">
         <term><command>bssh</command></term>
         <listitem>
-          <para>browses for SSH/VNC servers on the local network.</para>
+          <para>browses for SSH servers on the local network.</para>
           <indexterm zone="avahi bssh">
             <primary sortas="b-bssh">bssh</primary>
@@ -320,4 +420,13 @@
       </varlistentry>
 
+      <varlistentry id="bvnc">
+        <term><command>bvnc</command></term>
+        <listitem>
+          <para>browses for VNC servers on the local network.</para>
+          <indexterm zone="avahi bvnc">
+            <primary sortas="b-bvnc">bvnc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <!--<varlistentry id="libavahi-client">
@@ -371,4 +480,14 @@
       </varlistentry>
 
+      <varlistentry id="libavahi-ui-gtk3">
+        <term><filename class='libraryfile'>libavahi-ui-gtk3.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="avahi libavahi-ui-gtk3">
+            <primary sortas="c-libavahi-ui-gtk3">libavahi-ui-gtk3.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libavahi-ui">
         <term><filename class='libraryfile'>libavahi-ui.{so,a}</filename></term>
@@ -379,4 +498,24 @@
           </indexterm>
         </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdns_sd">
+        <term><filename class='libraryfile'>libdns_sd.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="avahi libdns_sd">
+            <primary sortas="c-libdns_sd">libdns_sd.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libhowl">
+        <term><filename class='libraryfile'>libhowl.{so,a}</filename></term>
+        <listitem>
+          <para>contains functions that .....</para>
+          <indexterm zone="avahi libhowl">
+            <primary sortas="c-libhowl">libhowl.{so,a}</primary>
+          </indexterm>
+        </listitem>
       </varlistentry>-->
 
