diff --git a/rc/bashrc b/rc/bashrc
index 5d47c057..900dcc0a 100644
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -226,8 +226,8 @@ if [ -f ~/.gnupg/sshcontrol ]; then
 # otherwise use the normal ssh-agent
 else
     # if the output is going to /dev/null, it's non/existence doesn't matter
-    (ssh-agent -a /tmp/$USER.agent > /dev/null 2>&1)
-    export SSH_AUTH_SOCK=/tmp/$USER.agent
+    (ssh-agent -a /tmp/$USER.sshagent > /dev/null 2>&1)
+    export SSH_AUTH_SOCK=/tmp/$USER.sshagent
 fi
 
 # OS X ls colours (copied from https://apple.stackexchange.com/questions/33677/
diff --git a/rc/zshrc b/rc/zshrc
index dbab667a..2a922bae 100644
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -177,8 +177,8 @@ if [ -f ~/.gnupg/sshcontrol ]; then
 # otherwise use the normal ssh-agent
 else
     # if the output is going to /dev/null, it's non/existence doesn't matter
-    (ssh-agent -a /tmp/$USER.agent > /dev/null 2>&1)
-    export SSH_AUTH_SOCK=/tmp/$USER.agent
+    (ssh-agent -a /tmp/$USER.sshagent > /dev/null 2>&1)
+    export SSH_AUTH_SOCK=/tmp/$USER.sshagent
 fi
 
 # If we are on Linux, enable apt progress bar and colours