diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
index 9f170e0..1ab402c 100755
--- a/dotfiles/xinitrc
+++ b/dotfiles/xinitrc
@@ -32,5 +32,15 @@ if [ -r ~/.xinitrc.local ]; then
 	. ~/.xinitrc.local
 fi
 
+if [ -z "${SSH_AUTH_PID:-}" ]; then
+	eval $(ssh-agent -s)
+fi
+
 : ${logdir:=~/local/var/log}
-exec herbstluftwm -l >"$logdir/hlwm.out" 2>"$logdir/hlwm.err"
+mkdir -p "$logdir"
+herbstluftwm -l >"$logdir/hlwm.out" 2>"$logdir/hlwm.err"
+
+if [ -n "$SSH_AGENT_PID" ]; then
+	ssh-add -D </dev/null
+	eval $(ssh-agent -ks)
+fi