diff --git a/plugins/quake/qstat b/plugins/quake/qstat
index 32c645c6..d1593453 100755
--- a/plugins/quake/qstat
+++ b/plugins/quake/qstat
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
 #################################################################
 # Title : Qstat plugin for Munin                                #
 # Author : Benjamin DUPUIS - Poil				#
@@ -9,7 +9,7 @@
 #################################################################
 # Variable :							#
 #---------------------------------------------------------------#
-qstat_exe='/usr/local/bin/qstat'
+qstat_exe="${qstat_exe:-/usr/local/bin/qstat}"
 
 #---------------------------------------------------------------#
 # End of config
@@ -23,7 +23,7 @@ usage() {
 	echo 'For testing the script, run qstat_ GameType IP Port'
 	echo ' - GameType : q3s, q4s ... run qstat for seeing available gametype'
 	echo 'For munin you must ln -s /usr/share/munin/plugins/qstat_ /etc/munin/plugins/qstat_GameType_IP2test_Port'
-	echo 'Perhaps you must have to set qstat_exe path, actually on'${qstat_exe};
+	echo 'Perhaps you must have to set qstat_exe path, actually on' "${qstat_exe}";
 	echo 'Have Fun'
 }
 
@@ -40,16 +40,17 @@ config() {
 
 echo "graph_title Number of players on ${gametype} - ${ip}:${port}
 graph_vlabel players
-graph_args --base 1000 -r --lower-limit 0 --upper-limit 16
+graph_args --base 1000 -r --lower-limit 0
 graph_category games
 maxplayer.label max players
+bot.label bots
 player.label players"
 }
 
 #################################################################
 #       Quake Stat, call qstat	                                #
 #---------------------------------------------------------------#
-quake_stat() {
+qstat_run() {
 	if [ "${script_name}" != "qstat_" ]; then
                 gametype=$(echo "$script_name" | cut -d_ -f2)
                 ip=$(echo "$script_name" | cut -d_ -f3)
@@ -61,24 +62,33 @@ quake_stat() {
 	fi
 
 	if [ -n "$gametype" ] && [ -n "$gametype" ] && [ -n "$gametype" ]; then
-		dummy=$("$qstat_exe" -raw ";" -nh "-$gametype" "${ip}:${port}")
+		rawstats=$("$qstat_exe" -raw ";" -nh "-$gametype" "${ip}:${port}")
 
-		playervalue=$(echo "$dummy" | cut -d\; -f6)
-		maxplayervalue=$(echo "$dummy" | cut -d\; -f5)
+		playervalue=$(echo "$rawstats" | cut -d\; -f6)
+		maxplayervalue=$(echo "$rawstats" | cut -d\; -f5)
+		
+		# Assume that bots have a ping time of 0 miliseconds
+		botvalue=$("$qstat_exe" -P -pa -sort P "-$gametype" "${ip}:${port}" | grep -c 0ms)
 
 		if [ -z "${playervalue}" ]; then
 			playervalue=0
 		fi
 
+		if [ -z "${botvalue}" ]; then
+			botvalue=0
+		fi
+
 		if [ -z "${maxplayervalue}" ]; then
 		        maxplayervalue=0
 		fi
 
 
 		echo "maxplayer.value "${maxplayervalue};
+		echo "bot.value "${botvalue};
 		echo "player.value "${playervalue};
 	else
 		echo "maxplayer.value U"
+		echo "bot.value U"
 		echo "player.value U"
 	fi
 }
@@ -99,7 +109,7 @@ case $1 in
 		echo "no (edit the script for set qstat path)"
 	;;
 	*)
-		quake_stat "$@"
+		qstat_run "$@"
 		exit 0
 	;;
 esac