diff --git a/packages/network/avahi/install b/packages/network/avahi/install
index ec2ca0432b..f6567ffe80 100755
--- a/packages/network/avahi/install
+++ b/packages/network/avahi/install
@@ -40,14 +40,7 @@ mkdir -p $INSTALL/etc/avahi
 
 mkdir -p $INSTALL/etc/avahi/services
 #  cp $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
-
-  if [ $SAMBA_SERVER = "yes" ]; then
-    if [ -f $PROJECT_DIR/$PROJECT/avahi/samba.service ]; then
-      cp $PROJECT_DIR/$PROJECT/avahi/samba.service $INSTALL/etc/avahi/services
-    else
-      cp $PKG_DIR/config/samba.service $INSTALL/etc/avahi/services
-    fi
-  fi
+#  cp $PKG_DIR/config/samba.service $INSTALL/etc/avahi/services
 
   if [ $SFTP_SERVER = "yes" ]; then
     cp $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
diff --git a/packages/network/samba/build b/packages/network/samba/build
index c909fb180b..b9a89077ec 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -22,6 +22,12 @@
 
 . config/options $1
 
+if [ "$AVAHI_DAEMON" = yes ]; then
+  SMB_AVAHI="--enable-avahi"
+else
+  SMB_AVAHI="--disable-avahi"
+fi
+
 CFLAGS="$CFLAGS -fPIC -DPIC"
 
 cd $PKG_BUILD/source3
@@ -73,7 +79,7 @@ samba_cv_have_setresuid=yes \
             --disable-relro \
             --disable-fam \
             --disable-dnssd \
-            --disable-avahi \
+            $SMB_AVAHI \
             --disable-pthreadpool \
             --enable-gnutls \
             --disable-netapi \
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 43abf77b17..01187673f8 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -34,3 +34,8 @@ PKG_LONGDESC="Samba is a SMB server that runs on Unix and other operating system
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
+
+if [ "$AVAHI_DAEMON" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS avahi"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
+fi
diff --git a/projects/ATV/avahi/samba.service b/projects/ATV/avahi/samba.service
deleted file mode 100644
index 0cccf71f1c..0000000000
--- a/projects/ATV/avahi/samba.service
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
- <name replace-wildcards="yes">%h</name>
-  <service>
-   <type>_smb._tcp</type>
-   <port>445</port>
-  </service>
-  <service>
-   <type>_device-info._tcp</type>
-   <port>0</port>
-   <txt-record>model=AppleTV1,1</txt-record>
-  </service>
-</service-group>