diff --git a/dotfiles/profile b/dotfiles/profile
index d533854..9a5b0af 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -5,7 +5,12 @@ if test -f $GPG_AGENT_INFO_PATH && kill -0 `cut -d: -f 2 $GPG_AGENT_INFO_PATH` 2
   export GPG_AGENT_INFO SSH_AUTH_SOCK SSH_AGENT_PID
 else
   if which gpg-agent >/dev/null 2>&1 ; then
-    gpg-agent -q 2>/dev/null || eval `gpg-agent --daemon --enable-ssh-support --write-env-file $GPG_AGENT_INFO_PATH` 2>/dev/null
+    if [ -z "$SSH_AUTH_SOCK" ] ; then
+      gpg-agent -q 2>/dev/null || eval `gpg-agent --daemon --enable-ssh-support --write-env-file $GPG_AGENT_INFO_PATH` 2>/dev/null
+    else
+      gpg-agent -q 2>/dev/null || eval `gpg-agent --daemon --write-env-file $GPG_AGENT_INFO_PATH` 2>/dev/null
+    fi
+  export GPG_AGENT_INFO SSH_AUTH_SOCK SSH_AGENT_PID
   fi
 fi
 unset GPG_AGENT_INFO_PATH