diff --git a/.gitignore b/.gitignore
index aee6713..558aa1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 !.bash_profile
 !.liquidpromptrc
 !.gitconfig
+!.ssh
+.ssh/*
+!.ssh/config
diff --git a/.ssh/config b/.ssh/config
new file mode 100644
index 0000000..55d97f5
--- /dev/null
+++ b/.ssh/config
@@ -0,0 +1,9 @@
+Host *
+    AddKeysToAgent yes
+    ControlMaster auto
+    ControlPath ~/.ssh/master-%r@%h:%p
+    ControlPersist 5m
+    ServerAliveCountMax 18
+    ServerAliveInterval 5
+    TCPKeepAlive no
+    UseKeychain yes