diff --git a/.bashrc b/.bashrc
index 0a15b4a..b9400b3 100644
--- a/.bashrc
+++ b/.bashrc
@@ -111,8 +111,15 @@ export GOPATH=${HOME}/src/go
 #--------------------------------------------------------------------------------
 # Check if we already have an agent running and sourced
 if [ -z "${SSH_AUTH_SOCK}" ]; then
-    eval `ssh-agent -s`
-    ssh-add
+    SSH_AUTH_SOCK_FILE=~/.ssh/auth_sock
+    if [ -S ${SSH_AUTH_SOCK_FILE} ]; then
+        export SSH_AUTH_SOCK=${SSH_AUTH_SOCK_FILE}
+        export SSH_AGENT_PID=$(cat ~/.ssh/agent.pid)
+    else
+        eval `ssh-agent -a ${SSH_AUTH_SOCK_FILE} -s`
+        echo ${SSH_AGENT_PID} > ~/.ssh/agent.pid
+        ssh-add
+    fi
 fi
 #--------------------------------------------------------------------------------