diff --git a/packages/network/samba/build b/packages/network/samba/build
index b7294d14a7..d9a85173aa 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -3,7 +3,13 @@
 . config/options
 
 $SCRIPTS/build toolchain
-$SCRIPTS/build avahi
+
+if [ "$AVAHI_DAEMON" = yes ]; then
+  $SCRIPTS/build avahi
+  SMB_AVAHI="--enable-avahi"
+else
+  SMB_AVAHI="--disable-avahi"
+fi
 
 # samba fails to compile with GCC 4.5.0's link time optimization.
   CFLAGS=`echo $CFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
@@ -24,7 +30,8 @@ cd $PKG_BUILD/source3
             --disable-static \
             --disable-pie \
             --disable-cups \
-            --enable-avahi \
+            $SMB_AVAHI \
+            --without-pam \
             --without-ads \
             --with-libtalloc \
             --with-libtdb \
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 69c96c2cf4..25e89314b8 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -2,7 +2,7 @@
 
 . config/options
 
-$SCRIPTS/install avahi
+[ "$AVAHI_DAEMON" = yes ] && $SCRIPTS/install avahi
 
 PKG_DIR=`find $PACKAGES -type d -name $1`