diff --git a/etc/nsswitch.conf b/etc/nsswitch.conf
new file mode 100644
index 00000000..6ef6e3ba
--- /dev/null
+++ b/etc/nsswitch.conf
@@ -0,0 +1,4 @@
+# https://wiki.archlinux.org/index.php/Avahi#Hostname_resolution
+# hosts: files dns myhostname
+hosts: files mdns_minimal [NOTFOUND=return] dns myhostname
+