3 files changed, 13 insertions, 2 deletions
diff --git a/debian/avahi-daemon.links b/debian/avahi-daemon.links
index f1e4ebb..9c3e15c 100644
--- a/debian/avahi-daemon.links
+++ b/debian/avahi-daemon.links
@@ -1 +1,5 @@
 etc/network/if-up.d/avahi-daemon etc/network/if-post-down.d/avahi-daemon
+lib/systemd/system/avahi-daemon.service etc/systemd/system/dbus-org.freedesktop.Avahi.service
+lib/systemd/system/avahi-daemon.service etc/systemd/system/multi-user.target.wants/avahi-daemon.service
+lib/systemd/system/avahi-daemon.socket  etc/systemd/system/sockets.target.wants/avahi-daemon.socket
+
diff --git a/debian/avahi-dnsconfd.links b/debian/avahi-dnsconfd.links
new file mode 100644
index 0000000..a1177f1
--- /dev/null
+++ b/debian/avahi-dnsconfd.links
@@ -0,0 +1 @@
+lib/systemd/system/avahi-dnsconfd.service etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service
diff --git a/debian/changelog b/debian/changelog
index ac39432..a5962a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,14 @@ avahi (0.6.29-1) UNRELEASED; urgency=low
   * Remove patches, merged upstream
     - debian/patches/03_read_null_udp_packets.patch
     - debian/patches/04-fix_netlink_flags_for_dump_operations.patch
-
- -- Michael Biebl <biebl@debian.org>  Fri, 11 Mar 2011 00:34:37 +0100
+  * debian/avahi-daemon.links
+    - Enable avahi-daemon by default when using systemd, so it can be started
+      via D-Bus activation, socket activation and multi-user.target.
+  * debian/avahi-dnsconfd.links
+    - Enable avahi-dnsconfd by default when using systemd. It will be started
+      by multi-user.target.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Mar 2011 01:54:00 +0100
 
 avahi (0.6.28-5) unstable; urgency=low