diff --git a/debian/vsftpd.init b/debian/vsftpd.init
index 8d7c20d..ddde5a3 100644
--- a/debian/vsftpd.init
+++ b/debian/vsftpd.init
@@ -71,10 +71,10 @@ case "${1}" in
 	stop)
 		log_daemon_msg "Stopping FTP server" "${NAME}"
 
-		start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --oknodo --exec ${DAEMON}
-		rm -f /var/run/vsftpd/vsftpd.pid
-
-		log_end_msg 0
+		start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --oknodo --retry 30 --exec ${DAEMON}
+		RET=$?
+		if [ $RET = 0 ]; then rm -f /var/run/vsftpd/vsftpd.pid; fi
+		log_end_msg $?
 		;;
 
 	restart)
@@ -99,5 +99,3 @@ case "${1}" in
 		exit 1
 		;;
 esac
-
-exit 0