diff --git a/etc/tunnelkeeper.conf b/etc/tunnelkeeper.conf
index 91f4e09..4ee48eb 100644
--- a/etc/tunnelkeeper.conf
+++ b/etc/tunnelkeeper.conf
@@ -1,7 +1,8 @@
-[tunnelkeeper]
+[settings]
 debug 0
 
-[ssh] # Everything below here obeys the same rules as ~/.ssh/config
+[ssh]
+# Everything in this section obeys the same rules as ~/.ssh/config
 
 # Examples
 # Host server1
diff --git a/tunnelkeeper b/tunnelkeeper
index dcbf1a4..85cbad4 100755
--- a/tunnelkeeper
+++ b/tunnelkeeper
@@ -9,7 +9,7 @@ awk -v "dir=$BASEDIR/var" '
   !/^\[/ {print >> dir"/"sec".conf"}' < $BASEDIR/etc/tunnelkeeper.conf
 
 SSHCONF="$BASEDIR/var/ssh.conf"
-TKCONF="$BASEDIR/var/tunnelkeeper.conf"
+TKCONF="$BASEDIR/var/settings.conf"
 
 if [[ ! -f "$SSHCONF" ]]; then
   echo "Config file \"$SSHCONF\" does not exist"