diff --git a/.gitmodules b/.gitmodules
index 2395807..ea56f9f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule "roles/bat"]
 	path = roles/bat
 	url = https://github.com/gantsign/ansible_role_bat.git
+[submodule "roles/avahi_daemon"]
+	path = roles/avahi_daemon
+	url = git@git.ccczh.ch:ansible-roles/role-avahi_daemon.git
diff --git a/host_vars/t460p.yml b/host_vars/t460p.yml
index db25bcb..8fea62e 100644
--- a/host_vars/t460p.yml
+++ b/host_vars/t460p.yml
@@ -1,4 +1,8 @@
 ---
+avahi_packages:
+  - nss-mdns
+  - avahi
+
 # local user config:
 users:
   l3d:
diff --git a/roles/avahi_daemon b/roles/avahi_daemon
new file mode 160000
index 0000000..f522c95
--- /dev/null
+++ b/roles/avahi_daemon
@@ -0,0 +1 @@
+Subproject commit f522c956f54ac95d1d02c017c24841cc1516bcfd
diff --git a/setup_t460p.yml b/setup_t460p.yml
index 5c4d65e..32e2a12 100644
--- a/setup_t460p.yml
+++ b/setup_t460p.yml
@@ -8,6 +8,11 @@
     - ansible_version
   gather_facts: no
 
+- name: avahi
+  hosts: t460p
+  roles:
+    - {role: avahi_daemon, tags: [avahi_daemon, avahi, mdns], become: true}
+
 - name: Install useful packages
   hosts: t460p
   tags: