diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
index ec4d895..c635b0d 100644
--- a/gnupg/.gnupg/gpg-agent.conf
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -1,3 +1,3 @@
 default-cache-ttl 14400
 max-cache-ttl 14400
-pinentry-program /usr/bin/pinentry-gnome3
+enable-ssh-support
diff --git a/shell/.profile b/shell/.profile
index 15a3d29..8f92d5c 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -30,3 +30,10 @@ fi
 
 export VISUAL=vim
 export EDITOR="$VISUAL"
+
+export GPG_TTY=$(tty)
+
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+fi