diff --git a/network/avahi/README b/network/avahi/README
index e7fc2df1e2..cfc18ad1a3 100644
--- a/network/avahi/README
+++ b/network/avahi/README
@@ -1,16 +1,15 @@
-Avahi is an implementation of the DNS Service Discovery and Multicast 
-DNS specifications for Zeroconf Computing. It uses D-BUS for 
-communication between user applications and a system daemon. The 
-daemon is used to coordinate application efforts in caching replies,
-necessary to minimize the traffic imposed on networks. This kind of
-technology is already found in Apple MacOS X (branded Rendezvous
-Bonjour and sometimes Zeroconf) and is very convenient.
-
-Required dependency libdaemon, which is available at SlackBuilds.org.
-Optional dependencies: mono and/or qt4 (also available at 
-SlackBuilds.org); enable with MONO=yes QT4=yes ./avahi.SlackBuild
+Avahi is an implementation of the DNS Service Discovery and Multicast DNS 
+specifications for Zeroconf Computing.  It uses D-BUS for communication 
+between user applications and a system daemon.  The daemon is used to 
+coordinate application efforts in caching replies, necessary to minimize the 
+traffic imposed on networks.  This kind of technology is already found in 
+Apple MacOS X (branded Rendezvous Bonjour and sometimes Zeroconf) and is very 
+convenient.
 
 You will need to have an "avahi" user and group on the target system
 prior to installing the avahi package.  See README.SBo in this 
 directory (it is also installed to the package docmentation directory)
 for more information and for setup notes.
+
+This requires libdaemon, and mono is optional - enable it with the following:
+  MONO=yes ./avahi.SlackBuild
diff --git a/network/avahi/README.SBo b/network/avahi/README.SBo
index 7ed36c711e..d05e6bb6b9 100644
--- a/network/avahi/README.SBo
+++ b/network/avahi/README.SBo
@@ -3,17 +3,23 @@ README.SBo (avahi)
 First, be sure you have an "avahi" user and group.  Do this *before*
 you install the avahi package.  We recommend uid/gid of 214, but 
 adjust as needed for your system.  Something like this should suffice:
+
   # groupadd -g 214 avahi
   # useradd -u 214 -g 214 -c "Avahi User" -d /dev/null -s /bin/false avahi
 
+
 Now start the Avahi daemon:
+
 	# /etc/rc.d/rc.avahidaemon start
 
 Optionally start the unicast DNS configuration daemon:
+
 	# /etc/rc.d/rc.avahidnsconfd start
 
+
 You will need to start avahi at boot by adding the following 
 to your /etc/rc.d/rc.local and make them executable:
+
         # Start avahidaemon
 	if [ -x /etc/rc.d/rc.avahidaemon ]; then
 	  /etc/rc.d/rc.avahidaemon start
@@ -23,3 +29,15 @@ to your /etc/rc.d/rc.local and make them executable:
 	  /etc/rc.d/rc.avahidnsconfd start
 	fi
 
+You will also want to put the following into /etc/rc.d/rc.local_shutdown
+(if that file does not exist, create it and make it executable):
+
+        # Stop avahidnsconfd
+	if [ -x /etc/rc.d/rc.avahidnsconfd ]; then
+	  /etc/rc.d/rc.avahidnsconfd stop
+	fi
+        # Stop avahidaemon
+	if [ -x /etc/rc.d/rc.avahidaemon ]; then
+	  /etc/rc.d/rc.avahidaemon stop
+	fi
+
diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild
index 5887d37cdb..7f5fef5f9e 100644
--- a/network/avahi/avahi.SlackBuild
+++ b/network/avahi/avahi.SlackBuild
@@ -33,13 +33,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Support for QT4
-if [ "${QT4:-no}" = "no" ]; then
-    QT4="--disable-qt4"
-else
-    QT4="--enable-qt4"
-fi
-
 # Support for mono
 if [ "${MONO:-no}" = "no" ]; then
     MONO="--disable-mono"
@@ -47,14 +40,6 @@ else
     MONO="--enable-mono"
 fi
 
-if [ "${ARCH}" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-fi
-
 warn_accounts() {
   echo "  You must have an avahi user and group to run this script. "
   echo "  Something like this should suffice for most systems: "
@@ -71,6 +56,17 @@ if ! grep -q "^avahi:" /etc/group ; then
   warn_accounts
 fi 
 
+if [ "${ARCH}" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -86,6 +82,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -99,7 +96,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-dbus \
   --enable-python \
   --enable-gtk \
-  --enable-qt3 \
+  --enable-qt4 \
+  --disable-qt3 \
   --enable-core-docs \
   --enable-compat-howl \
   --enable-compat-libdns_sd \
@@ -110,9 +108,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-distro=slackware \
   --program-prefix= \
   --program-suffix= \
-  $MONO \
-  $QT4 \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  $MONO 
 
 make
 make install DESTDIR=$PKG
@@ -129,6 +126,12 @@ make install DESTDIR=$PKG
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
+mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new
+mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new
+mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new
+mv $PKG/etc/dbus-1/system.d/avahi-dbus.conf \
+  $PKG/etc/dbus-1/system.d/avahi-dbus.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -137,11 +140,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
-mv $PKG/etc/rc.d/rc.avahidaemon $PKG/etc/rc.d/rc.avahidaemon.new
-mv $PKG/etc/rc.d/rc.avahidnsconfd $PKG/etc/rc.d/rc.avahidnsconfd.new
-mv $PKG/etc/avahi/avahi-daemon.conf $PKG/etc/avahi/avahi-daemon.conf.new
-mv $PKG/etc/dbus-1/system.d/avahi-dbus.conf \
-  $PKG/etc/dbus-1/system.d/avahi-dbus.conf.new
-
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/avahi/avahi.info b/network/avahi/avahi.info
index ed54b54e8c..a229066da2 100644
--- a/network/avahi/avahi.info
+++ b/network/avahi/avahi.info
@@ -2,7 +2,9 @@ PRGNAM="avahi"
 VERSION="0.6.25"
 HOMEPAGE="http://avahi.org/"
 DOWNLOAD="http://avahi.org/download/avahi-0.6.25.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="a83155a6e29e3988f07e5eea3287b21e"
+MD5SUM_x86_64=""
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"