diff --git a/autossh.changes b/autossh.changes
index 9d68ec5..24fe3f5 100644
--- a/autossh.changes
+++ b/autossh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 18 15:45:10 UTC 2012 - multyrealm@gmail.com
+
+- updated autossh configuration options 
+
 -------------------------------------------------------------------
 Mon Apr 16 07:31:56 UTC 2012 - cfarrell@suse.com
 
diff --git a/autossh.conf b/autossh.conf
index 2ca96d5..61addfd 100644
--- a/autossh.conf
+++ b/autossh.conf
@@ -2,18 +2,17 @@
 ## Description: Autossh service settings
 
 ## Type:           integer
-## Default:        0
+## Default:        600
 #
-# Time ssh must be up before it is considered a successful connection.
-# If set to 0, then this behaviour is disabled, and as well, autossh
-# will retry even on failure of first attempt to run ssh.
-AUTOSSH_GATETIME="0"
+# Specifies the time to wait before the first connection test.
+# Thereafter the general poll time is used (see AUTOSSH_POLL).
+AUTOSSH_FIRST_POLL="600"
 
 ## Type:           list(0,1,2,3,4,5,6,7)
-## Default:        7
+## Default:        6
 #
 # Specifies the log level, corresponding to the levels used by syslog.
-AUTOSSH_LOGLEVEL="7"
+AUTOSSH_LOGLEVEL="6"
 
 ## Type:           integer
 ## Default:        600
@@ -33,7 +32,7 @@ AUTOSSH_POLL="600"
 AUTOSSH_PORT="0"
 
 ## Type:           string
-## Default:        user@example.com -p 22 -nNT -R 30000:localhost:22 -o ExitOnForwardFailure=yes
+## Default:        user@example.com -p 22 -ynNT -R 30000:localhost:22 -o ExitOnForwardFailure=yes -o ServerAliveInterval=60 -o ServerAliveCountMax=3
 #
 # Options to be passed to ssh
-AUTOSSH_OPTIONS="user@example.com -p 22 -nNT -R 30000:localhost:22 -o ExitOnForwardFailure=yes"
+AUTOSSH_OPTIONS="user@example.com -p 22 -ynNT -R 30000:localhost:22 -o ExitOnForwardFailure=yes -o ServerAliveInterval=60 -o ServerAliveCountMax=3"
diff --git a/autossh.init b/autossh.init
index 77b73db..77268ae 100644
--- a/autossh.init
+++ b/autossh.init
@@ -38,15 +38,14 @@ rc_reset
 
 case "$1" in
     start)
-        export AUTOSSH_FIRST_POLL="60"
         export AUTOSSH_PIDFILE="/var/run/autossh.pid"
-        export AUTOSSH_GATETIME
+        export AUTOSSH_FIRST_POLL
         export AUTOSSH_LOGLEVEL
         export AUTOSSH_POLL
         export AUTOSSH_PORT
 
         echo -n "Starting autossh "
-        /sbin/startproc $AUTOSSH_BIN $AUTOSSH_OPTIONS
+        /sbin/startproc $AUTOSSH_BIN -f $AUTOSSH_OPTIONS
 
         rc_status -v
         ;;
diff --git a/autossh.spec b/autossh.spec
index a0efe4a..b9bd2c5 100644
--- a/autossh.spec
+++ b/autossh.spec
@@ -15,15 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Summary:        Automatically restart SSH sessions and tunnels
+License:        BSD-3-Clause
+Group:          Productivity/Networking/SSH
 
 Name:           autossh
 Version:        1.4c
-Release:        1
-License:        BSD-3-Clause
-Group:          Productivity/Networking/SSH
+Release:        0
 Url:            http://www.harding.motd.ca/autossh/
 Source:         http://www.harding.motd.ca/autossh/autossh-1.4c.tgz
 Source1:        autossh.init