4 files changed, 7 insertions, 2 deletions
diff --git a/debian/ayatana-indicator-messages.install b/debian/ayatana-indicator-messages.install
index 8cf384a..47c562c 100644
--- a/debian/ayatana-indicator-messages.install
+++ b/debian/ayatana-indicator-messages.install
@@ -1,6 +1,6 @@
 usr/lib/*/ayatana-indicator-messages/ayatana-indicator-messages-service
+usr/lib/systemd
 usr/share/ayatana/indicators
-usr/share/upstart
 usr/share/glib-2.0
 usr/share/icons
 usr/share/locale
diff --git a/debian/ayatana-indicator-messages.links b/debian/ayatana-indicator-messages.links
new file mode 100644
index 0000000..0bf0328
--- /dev/null
+++ b/debian/ayatana-indicator-messages.links
@@ -0,0 +1,3 @@
+# Because dh-systemd does not support user units for compat levels below 12, we manually make the WantedBy link
+# FIXME: drop this once we bump DH compat level to 12 or higher
+/usr/lib/systemd/user/ayatana-indicator-messages.service /usr/lib/systemd/user/ayatana-indicators.target.wants/ayatana-indicator-messages.service
+\ No newline at end of file
diff --git a/debian/control b/debian/control
index 027f665..648990d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf | debhelper (>= 9.20160403~),
+               dh-systemd | debhelper (>= 10.2~),
                gobject-introspection (>= 0.9.12-4~),
                gtk-doc-tools,
                intltool,
@@ -14,6 +15,7 @@ Build-Depends: debhelper (>= 9),
                mate-common,
                python3-dbusmock,
                valac,
+               systemd [linux-any],
 Standards-Version: 4.2.1
 Homepage: https://github.com/AyatanaIndicators/ayatana-indicator-messages
 Vcs-Git: https://github.com/AyatanaIndicators/ayatana-indicator-messages
diff --git a/debian/rules b/debian/rules
index eb8bcc6..e97abfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	dh $@ --with autoreconf,gir
+	dh $@ --with autoreconf,gir,systemd
 
 override_dh_autoreconf:
 	if [ ! -e po/ayatana-indicator-messages.pot.bak ]; then \