diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 8ced2f1a..8d8b3720 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -616,6 +616,10 @@ function remove_xmpp {
     remove_completion_param install_xmpp
     sed -i '/xmpp/d' $COMPLETION_FILE
     sed -i '/prosody/d' $COMPLETION_FILE
+
+    rm /etc/avahi/services/xmpp.service
+    rm /etc/avahi/services/xmpp-server.service
+    systemctl restart avahi-daemon
 }
 
 function xmpp_email_headers {
@@ -1131,6 +1135,29 @@ function install_xmpp {
 
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a xmpp -p "$XMPP_PASSWORD"
 
+    # Add avahi services
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/xmpp.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/xmpp.service
+    echo '<service-group>' >> /etc/avahi/services/xmpp.service
+    echo '  <name replace-wildcards="yes">%h XMPP</name>' >> /etc/avahi/services/xmpp.service
+    echo '  <service>' >> /etc/avahi/services/xmpp.service
+    echo '    <type>_xmpp._tcp</type>' >> /etc/avahi/services/xmpp.service
+    echo "    <port>5222</port>" >> /etc/avahi/services/xmpp.service
+    echo '  </service>' >> /etc/avahi/services/xmpp.service
+    echo '</service-group>' >> /etc/avahi/services/xmpp.service
+
+    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/xmpp-server.service
+    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/xmpp-server.service
+    echo '<service-group>' >> /etc/avahi/services/xmpp-server.service
+    echo '  <name replace-wildcards="yes">%h XMPP S2S</name>' >> /etc/avahi/services/xmpp-server.service
+    echo '  <service>' >> /etc/avahi/services/xmpp-server.service
+    echo '    <type>_xmpp-server._tcp</type>' >> /etc/avahi/services/xmpp-server.service
+    echo "    <port>5269</port>" >> /etc/avahi/services/xmpp-server.service
+    echo '  </service>' >> /etc/avahi/services/xmpp-server.service
+    echo '</service-group>' >> /etc/avahi/services/xmpp-server.service
+
+    systemctl restart avahi-daemon
+
     APP_INSTALLED=1
 }