diff --git a/gnome/.local/share/applications/emacsclient.desktop b/gnome/.local/share/applications/emacsclient.desktop
new file mode 100644
index 0000000..f41fef7
--- /dev/null
+++ b/gnome/.local/share/applications/emacsclient.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Emacs Client
+GenericName=Text Editor
+Comment=Open a new Emacs GUI frame via emacsclient
+Exec=emacsclient -c -a "" %F
+Icon=emacs
+Type=Application
+Terminal=false
+Categories=Utility;TextEditor;
+StartupWMClass=Emacs
diff --git a/systemd/.config/systemd/user/emacs.service b/systemd/.config/systemd/user/emacs.service
index 7179786..b184d5f 100644
--- a/systemd/.config/systemd/user/emacs.service
+++ b/systemd/.config/systemd/user/emacs.service
@@ -1,12 +1,17 @@
 [Unit]
-Description=Emacs: the extensible, self-documenting text editor
+Description=Emacs text editor (daemon)
+Documentation=info:emacs man:emacs(1) https://gnu.org/software/emacs/
+After=graphical.target
 
 [Service]
 Type=forking
-ExecStart=/usr/local/bin/emacs --daemon
-ExecStop=/usr/local/bin/emacsclient --eval "(kill-emacs)"
-Environment=SSH_AUTH_SOCK=%t/keyring/ssh
+ExecStart=/usr/bin/emacs --daemon
+ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)"
 Restart=on-failure
 
+# Make sure it uses your session environment
+Environment=DISPLAY=:0
+Environment=XAUTHORITY=%h/.Xauthority
+
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target