diff --git a/zsh.d/50_gpg-agent.zsh b/zsh.d/50_gpg-agent.zsh
new file mode 100644
index 0000000..2336bc2
--- /dev/null
+++ b/zsh.d/50_gpg-agent.zsh
@@ -0,0 +1,17 @@
+# vim: ft=zsh
+
+if command-exists "gpg-agent"; then
+   # on OS X with GPGTools, comment out the next line:
+   if [[ "$OSTYPE" != "darwin"* ]]; then
+        # non OSX
+        eval $(gpg-agent --daemon)
+   fi
+
+   GPG_TTY=$(tty)
+   export GPG_TTY
+   if [ -f "${HOME}/.gpg-agent-info" ]; then
+         . "${HOME}/.gpg-agent-info"
+         export GPG_AGENT_INFO
+         export SSH_AUTH_SOCK
+   fi
+fi