diff --git a/src/freedombone-app-dlna b/src/freedombone-app-dlna
index 9bcf2dd3..25145f9a 100755
--- a/src/freedombone-app-dlna
+++ b/src/freedombone-app-dlna
@@ -94,6 +94,23 @@ function configure_firewall_for_dlna {
 
     firewall_add DLNA 1900 udp
     firewall_add DLNA 8200 tcp
+
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/dlna.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/dlna.service
+    echo '<service-group>' >> /etc/avahi/services/dlna.service
+    echo '  <name replace-wildcards="yes">%h DLNA</name>' >> /etc/avahi/services/dlna.service
+    echo '  <service>' >> /etc/avahi/services/dlna.service
+    echo '    <type>_dlna._tcp</type>' >> /etc/avahi/services/dlna.service
+    echo "    <port>8200</port>" >> /etc/avahi/services/dlna.service
+    echo '  </service>' >> /etc/avahi/services/dlna.service
+    echo '  <service>' >> /etc/avahi/services/dlna.service
+    echo '    <type>_dlna._udp</type>' >> /etc/avahi/services/dlna.service
+    echo "    <port>1900</port>" >> /etc/avahi/services/dlna.service
+    echo '  </service>' >> /etc/avahi/services/dlna.service
+    echo '</service-group>' >> /etc/avahi/services/dlna.service
+
+    systemctl restart avahi-daemon
+
     mark_completed $FUNCNAME
 }
 
@@ -167,6 +184,9 @@ function remove_dlna {
     remove_completion_param install_dlna
     firewall_remove 1900 udp
     firewall_remove 8200 tcp
+
+    rm /etc/avahi/services/dlna.service
+    systemctl restart avahi-daemon
 }
 
 function install_dlna_main {