diff --git a/roles/home-cli/files/bashrc b/roles/home-cli/files/bashrc
index 33e64f2..e8b8aab 100644
--- a/roles/home-cli/files/bashrc
+++ b/roles/home-cli/files/bashrc
@@ -1,4 +1,9 @@
 #!/bin/bash
+if ! [ -S "${SSH_AUTH_SOCK-:/dev/null}" ] && [ -x /usr/bin/ssh-agent ]
+then
+	exec /usr/bin/ssh-agent $SHELL
+fi
+
 export ACP_BASHRC=1
 
 if [ -f /etc/bashrc ]