diff --git a/Makefile b/Makefile
index 01c0662..ac2843c 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,7 @@ install-doc:
 install-service: service
 	mkdir -p ${DESTDIR}${PREFIX}/share/dbus-1/services/
 	install -m644 org.knopwob.dunst.service ${DESTDIR}${PREFIX}/share/dbus-1/services
+	install -Dm644 dunst.systemd.service ${DESTDIR}${PREFIX}/lib/systemd/user/dunst.service
 
 install: install-dunst install-doc install-service
 
diff --git a/contrib/dunst.systemd.service.in b/contrib/dunst.systemd.service.in
index 61ca237..11df700 100644
--- a/contrib/dunst.systemd.service.in
+++ b/contrib/dunst.systemd.service.in
@@ -1,12 +1,12 @@
 [Unit]
 Description=Dunst notification daemon
 Documentation=man:dunst(1)
+PartOf=graphical-session.target
 
 [Service]
 Type=dbus
 BusName=org.freedesktop.Notifications
 ExecStart=##PREFIX##/bin/dunst
-Environment=DISPLAY=:0
 
 [Install]
 WantedBy=default.target