diff --git a/etc/init.d/proxysql b/etc/init.d/proxysql
index 1397d92ad..2314731a3 100755
--- a/etc/init.d/proxysql
+++ b/etc/init.d/proxysql
@@ -8,7 +8,7 @@
 # Short-Description : High Performance Advanced Proxy for MySQL
 # Description : High Performance and Advanced Proxy for MySQL and forks.
 #               It provides advanced features like connection pool, query routing and rewrite,
-#               firewalling, throttling, real time analysis, error-free failover 
+#               firewalling, throttling, real time analysis, error-free failover
 
 DATADIR="/var/run/proxysql"
 OPTS="-c /etc/proxysql.cnf -D $DATADIR"
@@ -17,28 +17,37 @@ PIDFILE="$DATADIR/proxysql.pid"
 getpid() {
   if [ -f $PIDFILE ]
   then
-    if [ -r $PIDFILE ]
-    then
-      pid=`cat $PIDFILE`
-      if [ "X$pid" != "X" ]
-      then
-        # Verify that a process with this pid is still running.
-        pid=`ps -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
-        if [ "X$pid" = "X" ]
-        then
-          # This is a stale pid file.
-          rm -f $PIDFILE
-          echo "Removed stale pid file: $PIDFILE"
-        fi
-      fi
-    else
-      echo "Cannot read $PIDFILE."
-      exit 1
-    fi
+	if [ -r $PIDFILE ]
+	then
+	  pid=`cat $PIDFILE`
+	  if [ "X$pid" != "X" ]
+	  then
+		# Verify that a process with this pid is still running.
+		pid=`ps -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+		if [ "X$pid" = "X" ]
+		then
+		  # This is a stale pid file.
+			rm -f $PIDFILE
+		  echo "Removed stale pid file: $PIDFILE"
+		fi
+	  fi
+	else
+	  echo "Cannot read $PIDFILE."
+	  exit 1
+	fi
   fi
 }
 
 
+testpid() {
+	pid=`ps -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+	if [ "X$pid" = "X" ]
+	then
+	# Process is gone so remove the pid file.
+		rm -f $PIDFILE
+	fi
+}
+
 initial() {
 	OPTS="--initial $OPTS"
 	start
@@ -72,44 +81,97 @@ stop() {
 		echo "ProxySQL was not running."
 		exit 1
 	else
-		killall proxysql
-		exit 0
+		# Note: we send a kill to all the processes, not just to the child
+		for i in `pgrep proxysql` ; do
+			if [ "$i" != "$$" ]; then
+				kill $i
+			fi
+		done
+	#  Loop until it does.
+		savepid=$pid
+		CNT=0
+		TOTCNT=0
+		while [ "X$pid" != "X" ]
+		do
+			# Loop for up to 20 second
+			if [ "$TOTCNT" -lt "200" ]
+			then
+				if [ "$CNT" -lt "10" ]
+				then
+					CNT=`expr $CNT + 1`
+				else
+					echo -n "."
+					CNT=0
+				fi
+				TOTCNT=`expr $TOTCNT + 1`
+
+				sleep 0.1
+
+				testpid
+			else
+				pid=
+			fi
+		done
+		pid=$savepid
+		testpid
+		if [ "X$pid" != "X" ]
+		then
+			echo
+			echo "Timed out waiting for ProxySQL to exit."
+			echo "  Attempting a forced exit..."
+			for i in `pgrep proxysql` ; do
+				if [ "$i" != "$$" ]; then
+					kill -9 $i
+				fi
+			done
+		fi
+
+		pid=$savepid
+		testpid
+		if [ "X$pid" != "X" ]
+		then
+			echo "Failed to stop ProxySQL"
+			exit 1
+		else
+			echo "DONE!"
+		fi
 	fi
 }
 
+
 status() {
   getpid
   if [ "X$pid" = "X" ]
   then
-    echo "ProxySQL is not running."
-    exit 1
+		echo "ProxySQL is not running."
+		exit 1
   else
-    echo "ProxySQL is running ($pid)."
-    exit 0
+		echo "ProxySQL is running ($pid)."
+	exit 0
   fi
 }
 
 case "$1" in
-    start)
-    start
-  ;;
-		initial)
+	start)
+		start
+	;;
+	initial)
 		initial
 	;;
-    stop)
-    stop
-  ;;
-    status)
+	stop)
+		stop
+	;;
+	status)
 		status
-  ;;
-    restart)
-    stop
-    start
-  ;;
-    *)
-  echo "Usage: ProxySQL {start|stop|status|restart}"
-  exit 1
-  ;;
+	;;
+	restart)
+		stop
+		start
+	;;
+	*)
+		echo "Usage: ProxySQL {start|stop|status|restart|initial}"
+		exit 1
+	;;
 esac
 exit $?