diff -rubB owfs-3.2p1.orig/src/rpm/owfs.init owfs-3.2p1.new/src/rpm/owfs.init
--- owfs-3.2p1.orig/src/rpm/owfs.init	2016-02-04 23:09:53.010461440 +0300
+++ owfs-3.2p1.new/src/rpm/owfs.init	2017-07-31 11:12:48.027393389 +0300
@@ -19,7 +19,8 @@
 	exit 0
 fi
 
-lockfile=/var/lock/subsys/owfs
+LOCKFILE=/var/lock/subsys/owfs
+PIDFILE=/var/run/owfs.pid
 owfs=/usr/sbin/owfs
 RETVAL=0
 
@@ -32,7 +33,7 @@
 		options=${OPTIONS[$i]}
 		if [ "$mountpoint" != "" ]; then
 			[ -d $mountpoint ] || mkdir -p $mountpoint
-			$owfs $options $mountpoint >/dev/null
+			$owfs --pid-file "$PIDFILE" $options $mountpoint >/dev/null
 			RETVAL=$?
 			[ $RETVAL = 0 ] || {
 				echo_failure
@@ -45,7 +46,7 @@
 	done
 	echo_success
 	echo
-	touch ${lockfile}
+	touch ${LOCKFILE}
 	return 0
 }
 
@@ -68,10 +69,10 @@
 #		fi
 #		i=`expr $i + 1`
 #	done
-	killproc $owfs
+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- owfs
 	RETVAL=$?
 	echo
-	[ $RETVAL -eq 0 ] && rm -f ${lockfile}
+	[ $RETVAL -eq 0 ] && rm -f ${LOCKFILE}
 	return $RETVAL
 }
 
@@ -94,7 +95,7 @@
 	start
 	;;
   condrestart)
-	if [ -f ${lockfile} ]; then
+	if [ -f ${LOCKFILE} ]; then
 		stop
 		start
 	fi
diff -rubB owfs-3.2p1.orig/src/rpm/owftpd.init owfs-3.2p1.new/src/rpm/owftpd.init
--- owfs-3.2p1.orig/src/rpm/owftpd.init	2016-02-04 23:09:53.010461440 +0300
+++ owfs-3.2p1.new/src/rpm/owftpd.init	2017-07-31 11:12:39.530392837 +0300
@@ -19,7 +19,8 @@
 	exit 0
 fi
 
-lockfile=/var/lock/subsys/owftpd
+LOCKFILE=/var/lock/subsys/owftpd
+PIDFILE=/var/run/owftpd.pid
 owftpd=/usr/sbin/owftpd
 RETVAL=0
 
@@ -30,7 +31,7 @@
 		port=${PORT[$i]}
 		options=${OPTIONS[$i]}
 		if [ "$port" != "" ]; then
-			$owftpd -p $port $options >/dev/null
+			$owftpd --pid-file "$PIDFILE" -p $port $options >/dev/null
 			RETVAL=$?
 			[ $RETVAL = 0 ] || {
 				echo_failure
@@ -43,16 +44,16 @@
 	done
 	echo_success
 	echo
-	touch ${lockfile}
+	touch ${LOCKFILE}
 	return 0
 }
 
 stop() {
 	echo -n $"Shutdown owftpd: "
-	killproc $owftpd
+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- owftpd
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile}
+	[ $RETVAL = 0 ] && rm -f ${LOCKFILE}
 }
 
 # See how we were called.
@@ -71,7 +72,7 @@
 	start
 	;;
   condrestart)
-	if [ -f ${lockfile} ]; then
+	if [ -f ${LOCKFILE} ]; then
 		stop
 		start
 	fi
diff -rubB owfs-3.2p1.orig/src/rpm/owhttpd.init owfs-3.2p1.new/src/rpm/owhttpd.init
--- owfs-3.2p1.orig/src/rpm/owhttpd.init	2016-02-04 23:09:53.010461440 +0300
+++ owfs-3.2p1.new/src/rpm/owhttpd.init	2017-07-31 11:14:15.710399089 +0300
@@ -19,7 +19,8 @@
 	exit 0
 fi
 
-lockfile=/var/lock/subsys/owhttpd
+LOCKFILE=/var/lock/subsys/owhttpd
+PIDFILE=/var/run/owhttpd.pid
 owhttpd=/usr/sbin/owhttpd
 RETVAL=0
 
@@ -30,7 +31,7 @@
 		port=${PORT[$i]}
 		options=${OPTIONS[$i]}
 		if [ "$port" != "" ]; then
-			$owhttpd -p $port $options >/dev/null
+			$owhttpd --pid-file "$PIDFILE" -p $port $options >/dev/null
 			RETVAL=$?
 			[ $RETVAL = 0 ] || {
 				echo_failure
@@ -43,16 +44,16 @@
 	done
 	echo_success
 	echo
-	touch ${lockfile}
+	touch ${LOCKFILE}
 	return 0
 }
 
 stop() {
 	echo -n $"Shutdown owhttpd: "
-	killproc $owhttpd
+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- owhttpd
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile}
+	[ $RETVAL = 0 ] && rm -f ${LOCKFILE}
 }
 
 # See how we were called.
@@ -71,7 +72,7 @@
 	start
 	;;
   condrestart)
-	if [ -f ${lockfile} ]; then
+	if [ -f ${LOCKFILE} ]; then
 		stop
 		start
 	fi
diff -rubB owfs-3.2p1.orig/src/rpm/owserver.init owfs-3.2p1.new/src/rpm/owserver.init
--- owfs-3.2p1.orig/src/rpm/owserver.init	2016-02-04 23:09:53.010461440 +0300
+++ owfs-3.2p1.new/src/rpm/owserver.init	2017-07-31 11:15:11.315402704 +0300
@@ -19,7 +19,8 @@
 	exit 0
 fi
 
-lockfile=/var/lock/subsys/owserver
+LOCKFILE=/var/lock/subsys/owserver
+PIDFILE=/var/run/owserver.pid
 owserver=/usr/sbin/owserver
 RETVAL=0
 
@@ -31,7 +32,7 @@
 		interface=${INTERFACE[$i]}
 		options=${OPTIONS[$i]}
 		if [ "$port" != "" ]; then
-			$owserver -p $port $options >/dev/null
+			$owserver --pid-file "$PIDFILE" -p $port $options >/dev/null
 			RETVAL=$?
 			[ $RETVAL = 0 ] || {
 				echo_failure
@@ -44,16 +45,16 @@
 	done
 	echo_success
 	echo
-	touch ${lockfile}
+	touch ${LOCKFILE}
 	return 0
 }
 
 stop() {
 	echo -n $"Shutdown owserver: "
-	killproc $owserver
+	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" -- owserver
 	RETVAL=$?
 	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile}
+	[ $RETVAL = 0 ] && rm -f ${LOCKFILE}
 }
 
 # See how we were called.
@@ -72,7 +73,7 @@
 	start
 	;;
   condrestart)
-	if [ -f ${lockfile} ]; then
+	if [ -f ${LOCKFILE} ]; then
 		stop
 		start
 	fi