diff --git a/packing/deb/yate.init b/packing/deb/yate.init
index fc09eb9f..d9c35aac 100755
--- a/packing/deb/yate.init
+++ b/packing/deb/yate.init
@@ -21,7 +21,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 DESC="YATE"
 NAME=yate
 DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="-ds -p /var/run/yate.pid -l /var/log/yate -r -vvv"
+DAEMON_ARGS="-F -s -r -l /var/log/yate -vvv"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -81,7 +81,7 @@ do_start()
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
 		--nicelevel $NICE_LEVEL \
 		--user $YATE_USER --group $YATE_GROUP \
-		--exec $DAEMON -- $DAEMON_ARGS \
+		--exec $DAEMON -- -d -p $PIDFILE $DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
diff --git a/packing/deb/yate.init.defaults b/packing/deb/yate.init.defaults
index 96162e67..4195dd8e 100644
--- a/packing/deb/yate.init.defaults
+++ b/packing/deb/yate.init.defaults
@@ -4,7 +4,7 @@
 NO_START=1
 
 # arguments passed to yate
-DAEMON_ARGS="-ds -p /var/run/yate.pid -l /var/log/yate -r -vvv"
+DAEMON_ARGS="-F -s -r -l /var/log/yate -vvv"
 
 # yate user and group
 YATE_USER="root"
diff --git a/packing/portage/yate.init b/packing/portage/yate.init
index 9f37a9e8..c1ceb97f 100755
--- a/packing/portage/yate.init
+++ b/packing/portage/yate.init
@@ -12,7 +12,7 @@ depend() {
 	use mysql postgresql wanpipe zaptel
 }
 
-OPTS=${OPTS:- -rs -vvv -l /var/log/yate}
+OPTS=${OPTS:- -F -s -r -l /var/log/yate -vvv}
 PIDFILE=${PIDFILE:-/var/run/${SVCNAME}.pid}
 BINARY=${BINARY:-/usr/bin/yate}
 
diff --git a/packing/rpm/yate.init b/packing/rpm/yate.init
index 39571fb1..6e81adc7 100755
--- a/packing/rpm/yate.init
+++ b/packing/rpm/yate.init
@@ -10,7 +10,7 @@
 #
 
 # Extra Yate command line options
-OPTS="-rs -vvv -l /var/log/yate"
+OPTS="-F -s -r -l /var/log/yate -vvv"
 
 # Source function library.
 . /etc/rc.d/init.d/functions