diff --git a/openbox/.config/openbox/autostart b/openbox/.config/openbox/autostart
index 2695651..14df7f3 100755
--- a/openbox/.config/openbox/autostart
+++ b/openbox/.config/openbox/autostart
@@ -35,6 +35,9 @@ urxvtd -q -f -o &
 ## GPG
 (sleep 3; bash -c "secret-tool lookup 'gpg' 'login' | gpg2 --no-tty --pinentry-mode loopback --passphrase-fd 0 -d ~/.password-store/mail/uni.gpg") &
 
+## SSH agent
+(sleep 5; ssh-agent fish) &
+
 ## Spacemacs daemon
 (sleep 6; cd ~/.emacs.d; git pull --rebase; emacs --batch -l ~/.emacs.d/init.el --eval="(configuration-layer/update-packages t)"; emacs --daemon=instance1) &
 
diff --git a/openbox/.config/openbox/environment b/openbox/.config/openbox/environment
index 2d691c3..0c53d0d 100755
--- a/openbox/.config/openbox/environment
+++ b/openbox/.config/openbox/environment
@@ -1,3 +1,4 @@
 ## GNOME Keyring
-dbus-update-activation-environment
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets)
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null
diff --git a/openbox/.pam_environment b/openbox/.pam_environment
new file mode 100644
index 0000000..b55fba7
--- /dev/null
+++ b/openbox/.pam_environment
@@ -0,0 +1,2 @@
+SSH_AGENT_PID	DEFAULT=
+SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"