diff --git a/tunnelkeeper b/tunnelkeeper
index eec7284..2eeb0ea 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -37,7 +37,7 @@ function dbg () {
 }
 
 function connect () {
-  ssh -F "${SSHCONF}" $dbgopt -o "ControlMaster auto" -o "UserKnownHostsFile /dev/null" -S "$BASEDIR/var/$1.tksock" -N $1 '#tunnelkeeper' 2>&1 | dbg
+  ssh -F "${SSHCONF}" $dbgopt -o "ControlMaster auto" -o "StrictHostKeyChecking no" -S "$BASEDIR/var/$1.tksock" -N $1 '#tunnelkeeper' 2>&1 | dbg
 }
 
 
@@ -67,7 +67,7 @@ case "$1" in
     while true; do
       sleep $TIMEOUT
       echo "tick $2" | dbg
-      if [[ $(timeout $TIMEOUT ssh localhost -S $BASEDIR/var/$2.tksock "echo tk") != "tk" ]]; then
+      if [[ $(timeout $TIMEOUT ssh localhost -o "StrictHostKeyChecking no" -S $BASEDIR/var/$2.tksock "echo tk") != "tk" ]]; then
         ssh localhost -O exit -S $BASEDIR/var/$2.tksock
         echo "Killing connection to $2. Trying again." | dbg
       fi