diff --git a/zshrc b/zshrc
index 999b10a..0cac2a5 100755
--- a/zshrc
+++ b/zshrc
@@ -59,6 +59,13 @@ _comp_options+=(globdots)
 zle -N edit-command-line
 bindkey "" edit-command-line
 
+## Enable gpg-agent support
+
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+gpgconf --launch gpg-agent
+gpg-gpg-connect-agent /bye
+export GPG_TTY=$(tty)
+
 ## Load external stuff
 
 ## support for opam