diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index c140d7aa2..c111d0986 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -368,6 +368,10 @@ ifeq ($(CONFIG_SAMBA4_SERVER_WINBIND),y)
 endif
 ifeq ($(CONFIG_SAMBA4_SERVER_ACL),y)
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sharesec $(1)/usr/bin/
+endif
+ifeq ($(CONFIG_SAMBA4_SERVER_AVAHI),y)
+	$(INSTALL_DIR) $(1)/etc/avahi/services
+	$(INSTALL_DATA) ./files/samba.service $(1)/etc/avahi/services/
 endif
 	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/samba $(1)/etc/init.d
 	$(INSTALL_DATA) ./files/samba.config $(1)/etc/config/samba4
@@ -385,6 +389,7 @@ define Package/samba4-server/conffiles
 /etc/samba/idmap.ldb
 /etc/samba/lmhosts
 /etc/nsswitch.conf
+/etc/avahi/services/samba.service
 endef
 
 $(eval $(call BuildPackage,samba4-libs))
diff --git a/net/samba4/files/samba.service b/net/samba4/files/samba.service
new file mode 100644
index 000000000..8191e527f
--- /dev/null
+++ b/net/samba4/files/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>_adisk._tcp</type>
+   <txt-record>sys=waMa=0,adVF=0x100</txt-record>
+   <txt-record>dk0=adVN=TimeMachine,adVF=0x82</txt-record>
+ </service>
+  <service>
+    <type>_smb._tcp</type>
+    <port>445</port>
+  </service>
+</service-group>