diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 789be12a9790dbc8db2ce7b99c46b3654a1ede0c..364632aa38a49f24bf6c774eb19678ac08b0d067 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -26,6 +26,23 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+function web_admin_avahi {
+    { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';
+      echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">';
+      echo '<service-group>';
+      echo '  <name replace-wildcards="yes">%h http</name>';
+      echo '  <service>';
+      echo '    <type>_http._tcp</type>';
+      echo '    <port>80</port>';
+      echo '  </service>';
+      echo '  <service>';
+      echo '    <type>_https._tcp</type>';
+      echo '    <port>443</port>';
+      echo '  </service>';
+      echo '</service-group>'; } > /etc/avahi/services/webadmin.service
+    systemctl restart avahi-daemon
+}
+
 function web_admin_create_installed_apps {
     local_hostname=$(grep 'host-name' /etc/avahi/avahi-daemon.conf | awk -F '=' '{print $2}').local
     appslist_template_filename="/var/www/${local_hostname}/htdocs/admin/apps_template.html"
@@ -247,6 +264,8 @@ function install_web_admin {
     web_admin_create_installed_apps
 
     chown -R www-data:www-data "/var/www/${local_hostname}/htdocs"
+
+    web_admin_avahi
 }
 
 # NOTE: deliberately no exit 0