diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 4d8e9e400e7..8181e7443df 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -133,6 +133,11 @@ let
       export SSH_ASKPASS=${x11_ssh_askpass}/libexec/x11-ssh-askpass
       eval $(${openssh}/bin/ssh-agent)
     " else ""}
+
+    ### Allow user to override system-wide configuration
+    if test -f ~/.xsession; then
+        source ~/.xsession;
+    fi
   
 
     ### Start a window manager.