diff --git a/tunnelkeeper b/tunnelkeeper
index 4d21f1c..db5dc41 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -9,7 +9,7 @@ WATCHCONF="$BASEDIR/var/watch.conf"
 DEBUGCONF="$BASEDIR/var/debug.conf"
 
 function genconfig () {
-  mkdir -p "$BASEDIR/var"
+  mkdir -p "$BASEDIR/var/log"
   cat <<EOF > "$SSHCONF"
 Host *
   ExitOnForwardFailure yes
@@ -42,9 +42,9 @@ function debugopt () {
 }
 
 function dbg () {
-  while read line; do
-    [[ "$(awk "/^$1/ {print \$2}" ${DEBUGCONF})" =~ "[123]" ]] && echo $line >> "$BASEDIR/var/tunnelkeeper-$(date +"%Y%m%d").log"
-  done
+  if [[ "$(awk "/^$1/ {print \$2}" ${DEBUGCONF})" =~ "[123]" ]]; then
+    cat | sed "s/^/$(date +"%H:%M:%S")  /g" >> "$BASEDIR/var/log/tunnelkeeper-$(date +"%Y%m%d").log"
+  fi
 }
 
 function connect () {