diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 60b40cc2..157bbd51 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -597,6 +597,9 @@ function remove_matrix {
 
     remove_completion_param install_matrix
     sed -i '/matrix/d' $COMPLETION_FILE
+
+    rm /etc/avahi/services/matrix.service
+    systemctl restart avahi-daemon
 }
 
 function install_home_server {
@@ -802,5 +805,22 @@ function install_matrix {
 
     set_completion_param "matrix domain" "$MATRIX_DOMAIN_NAME"
 
+    # Add avahi services
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/matrix.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/matrix.service
+    echo '<service-group>' >> /etc/avahi/services/matrix.service
+    echo '  <name replace-wildcards="yes">%h MATRIX</name>' >> /etc/avahi/services/matrix.service
+    echo '  <service>' >> /etc/avahi/services/matrix.service
+    echo '    <type>_matrix._tcp</type>' >> /etc/avahi/services/matrix.service
+    echo "    <port>$MATRIX_HTTP_PORT</port>" >> /etc/avahi/services/matrix.service
+    echo '  </service>' >> /etc/avahi/services/matrix.service
+    echo '  <service>' >> /etc/avahi/services/matrix.service
+    echo '    <type>_matrix._udp</type>' >> /etc/avahi/services/matrix.service
+    echo "    <port>$MATRIX_HTTP_PORT</port>" >> /etc/avahi/services/matrix.service
+    echo '  </service>' >> /etc/avahi/services/matrix.service
+    echo '</service-group>' >> /etc/avahi/services/matrix.service
+
+    systemctl restart avahi-daemon
+
     APP_INSTALLED=1
 }