diff --git a/README.md b/README.md
index 453b32ac..e5ff74ce 100644
--- a/README.md
+++ b/README.md
@@ -124,6 +124,18 @@ Please go to [the issue tracker](https://github.com/jonls/redshift/issues) and
 check if your issue has already been reported. If not, please open a new issue
 describing you problem.
 
+
+**When running as a systemd service, redshift fails to connect to
+Xorg/Wayland**
+
+You need to export your environment variables when you window manager or
+compositor start up. Typically, you want to run this as part of its startup:
+
+    systemctl --user import-environment; systemctl --user start graphical-session.target
+
+See your compositor's (or window manager's) documentation for further details
+of setting up the systemd user session.
+
 Latest builds from master branch
 --------------------------------
 
diff --git a/data/systemd/redshift-gtk.service.in b/data/systemd/redshift-gtk.service.in
index 4675ccfc..79e61658 100644
--- a/data/systemd/redshift-gtk.service.in
+++ b/data/systemd/redshift-gtk.service.in
@@ -1,11 +1,11 @@
 [Unit]
 Description=Redshift display colour temperature adjustment (GUI)
 Documentation=http://jonls.dk/redshift/
-After=display-manager.service
+After=graphical-session.target
 
 [Service]
 ExecStart=@bindir@/redshift-gtk
 Restart=always
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target
diff --git a/data/systemd/redshift.service.in b/data/systemd/redshift.service.in
index bc51514c..aad31ca4 100644
--- a/data/systemd/redshift.service.in
+++ b/data/systemd/redshift.service.in
@@ -1,11 +1,11 @@
 [Unit]
 Description=Redshift display colour temperature adjustment
 Documentation=http://jonls.dk/redshift/
-After=display-manager.service
+After=graphical-session.target
 
 [Service]
 ExecStart=@bindir@/redshift
 Restart=always
 
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target