diff --git a/modules/services/dunst.nix b/modules/services/dunst.nix
index 8042cf93d..4d866cec3 100644
--- a/modules/services/dunst.nix
+++ b/modules/services/dunst.nix
@@ -22,7 +22,7 @@ with lib;
         };
 
         Install = {
-          WantedBy = [ "xorg.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
 
         Service = {
diff --git a/modules/services/gnome-keyring.nix b/modules/services/gnome-keyring.nix
index e50409065..b0edeaed4 100644
--- a/modules/services/gnome-keyring.nix
+++ b/modules/services/gnome-keyring.nix
@@ -45,7 +45,7 @@ in
       };
 
       Install = {
-        WantedBy = [ "xorg.target" ];
+        WantedBy = [ "graphical-session.target" ];
       };
     };
   };
diff --git a/modules/services/keepassx.nix b/modules/services/keepassx.nix
index 799f0e5c3..0ed90dd04 100644
--- a/modules/services/keepassx.nix
+++ b/modules/services/keepassx.nix
@@ -16,7 +16,7 @@ with lib;
         };
 
         Install = {
-          WantedBy = [ "xorg.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
 
         Service = {
diff --git a/modules/services/network-manager-applet.nix b/modules/services/network-manager-applet.nix
index 8b529c5b6..a7a90b618 100644
--- a/modules/services/network-manager-applet.nix
+++ b/modules/services/network-manager-applet.nix
@@ -16,7 +16,7 @@ with lib;
         };
 
         Install = {
-          WantedBy = [ "xorg.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
 
         Service = {
diff --git a/modules/services/random-background.nix b/modules/services/random-background.nix
index 0dabb8721..d0412310c 100644
--- a/modules/services/random-background.nix
+++ b/modules/services/random-background.nix
@@ -51,7 +51,7 @@ in
           };
 
           Install = {
-            WantedBy = [ "xorg.target" ];
+            WantedBy = [ "graphical-session.target" ];
           };
         };
       }
diff --git a/modules/services/taffybar.nix b/modules/services/taffybar.nix
index f9ab2ee61..87a840634 100644
--- a/modules/services/taffybar.nix
+++ b/modules/services/taffybar.nix
@@ -34,7 +34,7 @@ in
         };
 
         Install = {
-          WantedBy = [ "xorg.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
     };
   };
diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix
index 964629c7a..3fb038a74 100644
--- a/modules/services/udiskie.nix
+++ b/modules/services/udiskie.nix
@@ -22,7 +22,7 @@ with lib;
         };
 
         Install = {
-          WantedBy = [ "xorg.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
     };
   };
diff --git a/modules/services/xscreensaver.nix b/modules/services/xscreensaver.nix
index 582615539..0b1a4573a 100644
--- a/modules/services/xscreensaver.nix
+++ b/modules/services/xscreensaver.nix
@@ -20,7 +20,7 @@ with lib;
         };
 
         Install = {
-          WantedBy = [ "xorg.target" ];
+          WantedBy = [ "graphical-session.target" ];
         };
     };
   };
diff --git a/modules/xsession.nix b/modules/xsession.nix
index ab6629743..ec6d45055 100644
--- a/modules/xsession.nix
+++ b/modules/xsession.nix
@@ -34,7 +34,7 @@ in
       };
 
       Install = {
-        WantedBy = [ "xorg.target" ];
+        WantedBy = [ "graphical-session.target" ];
       };
 
       Service = {
@@ -53,6 +53,14 @@ in
       };
     };
 
+    # A basic graphical session target. Apparently this will come
+    # standard in future Systemd versions.
+    systemd.user.targets.graphical-session = {
+      Unit = {
+        Description = "Graphical session";
+      };
+    };
+
     home.file.".xsession" = {
       mode = "555";
       text = ''
@@ -64,13 +72,13 @@ in
         systemctl --user import-environment SSH_AUTH_SOCK
         systemctl --user import-environment XDG_DATA_DIRS
         systemctl --user import-environment XDG_RUNTIME_DIR
-        systemctl --user start xorg.target
+        systemctl --user start graphical-session.target
 
         ${cfg.initExtra}
 
         ${cfg.windowManager}
 
-        systemctl --user stop xorg.target
+        systemctl --user stop graphical-session.target
       '';
     };
   };