diff --git a/tmux.conf b/tmux.conf
index 9f4c18f..8a053c2 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -21,6 +21,9 @@ set -g allow-rename on
 set -g mode-keys vi
 set -g repeat-time 0
 
+# Bring over the SSH agent environment
+set -g update-environment SSH_AUTH_SOCK SSH_AGENT_PID
+
 #
 # STATUS BAR
 #