diff --git a/keychain-setup.sh b/keychain-setup.sh
new file mode 100644
index 000000000..cfcd28c8a
--- /dev/null
+++ b/keychain-setup.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# This script sets up the keychain and is sourced by .{ba,z}shrc.
+keychain ~/.ssh/id_rsa
+. ~/.keychain/${HOST}-sh
diff --git a/zshrc b/zshrc
index 76cf322ce..215a21e33 100644
--- a/zshrc
+++ b/zshrc
@@ -88,4 +88,6 @@ alias mk="make"
 alias ds="dirs -v | head -10"
 alias d="gd"
 
+source ~/.oh-my-zsh/keychain-setup.sh
+
 echo "Finished loading my .zshrc"