diff --git a/packages/network/avahi/config/http.service b/packages/network/avahi/config/http.service
index 8e0d3a5136..6763a05cf8 100644
--- a/packages/network/avahi/config/http.service
+++ b/packages/network/avahi/config/http.service
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <!DOCTYPE service-group SYSTEM "avahi-service.dtd">
 <service-group>
- <name replace-wildcards="yes">Web Server on %h</name>
+ <name replace-wildcards="yes">%h</name>
   <service>
    <type>_http._tcp</type>
    <port>80</port>
diff --git a/packages/network/avahi/config/samba.service b/packages/network/avahi/config/samba.service
index 0ec34cb3dc..5b44889bc6 100644
--- a/packages/network/avahi/config/samba.service
+++ b/packages/network/avahi/config/samba.service
@@ -1,9 +1,9 @@
 <?xml version="1.0" standalone='no'?><!--*-nxml-*-->
 <!DOCTYPE service-group SYSTEM "avahi-service.dtd">
 <service-group>
- <name replace-wildcards="yes">Samba Server on %h</name>
+ <name replace-wildcards="yes">%h</name>
   <service>
    <type>_smb._tcp</type>
-   <port>139</port>
+   <port>445</port>
   </service>
 </service-group>
diff --git a/packages/network/avahi/install b/packages/network/avahi/install
index 19b38473eb..3d03ee189d 100755
--- a/packages/network/avahi/install
+++ b/packages/network/avahi/install
@@ -39,7 +39,14 @@ mkdir -p $INSTALL/etc/avahi
 mkdir -p $INSTALL/etc/avahi/services
   cp $PKG_BUILD/avahi-daemon/ssh.service $INSTALL/etc/avahi/services
   cp $PKG_DIR/config/http.service $INSTALL/etc/avahi/services
-#  cp $PKG_DIR/config/samba.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
 
   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 b9a89077ec..c909fb180b 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -22,12 +22,6 @@
 
 . 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
@@ -79,7 +73,7 @@ samba_cv_have_setresuid=yes \
             --disable-relro \
             --disable-fam \
             --disable-dnssd \
-            $SMB_AVAHI \
+            --disable-avahi \
             --disable-pthreadpool \
             --enable-gnutls \
             --disable-netapi \
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 808988535a..f6c02cba1e 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -34,8 +34,3 @@ 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
new file mode 100644
index 0000000000..0cccf71f1c
--- /dev/null
+++ b/projects/ATV/avahi/samba.service
@@ -0,0 +1,14 @@
+<?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>