diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 823136b393..6e8910572e 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -53,11 +53,17 @@ $SCRIPTS/build SDL         #?
 $SCRIPTS/build SDL_mixer   #?
 $SCRIPTS/build SDL_image   #?
 
-$SCRIPTS/build avahi
 $SCRIPTS/build sqlite
 $SCRIPTS/build mysql #lib  #?
 $SCRIPTS/build samba #lib
 
+if [ "$AVAHI_DAEMON" = yes ]; then
+  $SCRIPTS/build avahi
+  XBMC_AVAHI="--enable-avahi"
+else
+  XBMC_AVAHI="--disable-avahi"
+fi
+
 if [ "$VDPAU" = yes ]; then
   $SCRIPTS/build libvdpau
   XBMC_VDPAU="--enable-vdpau"
@@ -84,6 +90,9 @@ fi
   CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
 
+# fixing undefined reference to 'log' in liba52
+  LDFLAGS="$LDFLAGS -lm"
+
 cd $PKG_BUILD
 
 cd xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
@@ -118,8 +127,8 @@ cd -
             --enable-faac \
             --enable-dvdcss \
             --disable-mid \
+            $XBMC_AVAHI \
             --disable-hal \
-            --enable-avahi \
             --enable-non-free \
             --disable-asap-codec \
             --enable-webserver \
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 1e68c406a4..c346ddd83c 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -58,7 +58,7 @@ $SCRIPTS/install SDL
 $SCRIPTS/install SDL_mixer
 $SCRIPTS/install SDL_image
 
-$SCRIPTS/install avahi
+[ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi
 $SCRIPTS/install sqlite
 $SCRIPTS/install mysql
 $SCRIPTS/install samba