diff -aur snapcast-orig/client/debian/snapclient.service snapcast/client/debian/snapclient.service
--- snapcast-orig/client/debian/snapclient.service	2017-03-17 14:59:08.600000000 +0100
+++ snapcast/client/debian/snapclient.service	2017-03-17 15:01:24.960000000 +0100
@@ -2,6 +2,8 @@
 Description=Snapcast client
 After=network-online.target sound.target
 Requires=network-online.target
+After=avahi-daemon.service
+Requires=avahi-daemon.service
 
 [Service]
 EnvironmentFile=-/etc/default/snapclient
diff -aur snapcast-orig/server/debian/snapserver.service snapcast/server/debian/snapserver.service
--- snapcast-orig/server/debian/snapserver.service	2017-03-17 14:59:08.610000000 +0100
+++ snapcast/server/debian/snapserver.service	2017-03-17 15:02:05.140000000 +0100
@@ -2,6 +2,8 @@
 Description=Snapcast server
 After=network-online.target
 Requires=network-online.target
+After=avahi-daemon.service
+Requires=avahi-daemon.service
 
 [Service]
 EnvironmentFile=-/etc/default/snapserver