Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -367,20 +367,13 @@
 
 if __has_command gpg gpg2; then
 	# Make sure GPG agent is running.
 	gpg --card-status &>/dev/null
 
-	local sock
-	if [ -d "$XDG_RUNTIME_DIR/gnupg" ]; then
-		sock=$(find "$XDG_RUNTIME_DIR/gnupg" -name S.gpg-agent.ssh |
-		       head -1)
-	fi
-	[ -n "$sock" ] || sock="$GNUPGHOME/S.gpg-agent.ssh"
-
-	alias gssh="SSH_AUTH_SOCK=$sock ssh -o IdentitiesOnly=no"
-	alias gssh-add="SSH_AUTH_SOCK=$sock ssh-add"
-	alias gsftp="SSH_AUTH_SOCK=$sock sftp -o IdentitiesOnly=no"
+	alias gssh='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ssh -o IdentitiesOnly=no'
+	alias gssh-add='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ssh-add'
+	alias gsftp='SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) sftp -o IdentitiesOnly=no'
 fi
 
 if __has_command cryptopassphrase; then
 	pwnk() {
 		local clipboard