diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 971d0a1e82..e4f5747538 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -127,7 +127,6 @@ fi
 
 if [ "$AVAHI_DAEMON" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
-  PKG_DEPENDS="$PKG_DEPENDS avahi"
 fi
 
 if [ "$MYSQL_SUPPORT" = yes ]; then
diff --git a/packages/network/avahi/build b/packages/network/avahi/build
index 0a7088b86b..8cf3b6d60c 100755
--- a/packages/network/avahi/build
+++ b/packages/network/avahi/build
@@ -31,8 +31,8 @@ ac_cv_func_chroot=no \
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
             --with-distro=none \
             --disable-glib \
             --disable-gobject \
diff --git a/packages/network/avahi/install b/packages/network/avahi/install
index 3d03ee189d..d46f33b589 100755
--- a/packages/network/avahi/install
+++ b/packages/network/avahi/install
@@ -56,26 +56,20 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
   cp $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d
 
 mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/avahi-utils/.libs/avahi-browse $INSTALL/usr/bin
+  cp $PKG_BUILD/avahi-utils/avahi-browse $INSTALL/usr/bin
     ln -sf avahi-browse $INSTALL/usr/bin/avahi-browse-domains
-  cp $PKG_BUILD/avahi-utils/.libs/avahi-publish $INSTALL/usr/bin
+  cp $PKG_BUILD/avahi-utils/avahi-publish $INSTALL/usr/bin
     ln -sf avahi-publish $INSTALL/usr/bin/avahi-publish-address
     ln -sf avahi-publish $INSTALL/usr/bin/avahi-publish-service
-  cp $PKG_BUILD/avahi-utils/.libs/avahi-resolve $INSTALL/usr/bin
+  cp $PKG_BUILD/avahi-utils/avahi-resolve $INSTALL/usr/bin
     ln -sf avahi-resolve $INSTALL/usr/bin/avahi-resolve-address
     ln -sf avahi-resolve $INSTALL/usr/bin/avahi-resolve-host-name
-  cp $PKG_BUILD/avahi-utils/.libs/avahi-set-host-name $INSTALL/usr/bin
+  cp $PKG_BUILD/avahi-utils/avahi-set-host-name $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/avahi-autoipd/avahi-autoipd $INSTALL/usr/sbin
-  cp $PKG_BUILD/avahi-daemon/.libs/avahi-daemon $INSTALL/usr/sbin
-  cp $PKG_BUILD/avahi-dnsconfd/.libs/avahi-dnsconfd $INSTALL/usr/sbin
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/avahi-common/.libs/*.so*[.0-9] $INSTALL/usr/lib/
-  cp -P $PKG_BUILD/avahi-core/.libs/*.so*[.0-9] $INSTALL/usr/lib/
-  cp -P $PKG_BUILD/avahi-client/.libs/*.so*[.0-9] $INSTALL/usr/lib/
-  cp -P $PKG_BUILD/avahi-compat-libdns_sd/.libs/*.so*[.0-9] $INSTALL/usr/lib/
+  cp $PKG_BUILD/avahi-daemon/avahi-daemon $INSTALL/usr/sbin
+  cp $PKG_BUILD/avahi-dnsconfd/avahi-dnsconfd $INSTALL/usr/sbin
 
 mkdir -p $PYTHON_LIB_DIR/site-packages/avahi
   cp -P $PKG_BUILD/avahi-python/avahi/*.py $PYTHON_LIB_DIR/site-packages/avahi