diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc
index f97240387e..bd1ac41529 100644
--- a/src/etc/inc/shaper.inc
+++ b/src/etc/inc/shaper.inc
@@ -29,6 +29,84 @@ require_once("globals.inc");
 require_once("functions.inc");
 require_once("util.inc");
 require_once("notices.inc");
+include_once("interfaces.inc");//required for convert_real_interface_to_friendly_interface_name() in get_queue_stats() to get altq interface name.
+
+function get_queue_stats() {
+	// due to sysutils\qstats not providing accurate stats with 'currently' valid numbers 
+	// in its current implementation this php function does the job for now..
+	$result = array();
+	$result['timestamp'] = gettimeofday(true);
+	$r = exec("/sbin/pfctl -s queue -v", $output, $ret);
+	$interfacestats = array();
+	foreach($output as $line) {
+		$partial = explode('{', $line);
+		$items = explode(" ", $partial[0]);
+		if (isset($partial[1])) {
+			$contains = explode(", ", substr($partial[1], 0, strlen($partial[1]) - 1));
+		} else {
+			unset($contains);
+		}
+		if ($items[0] == "queue") {
+			$level = 1;
+			while (empty($items[$level])) {
+				$level++;
+			}
+			unset($newqueue);
+			$newqueue = array();
+			$currentqueuename = $items[$level];
+			$currentqueueif = $items[$level+2];
+			$newqueue['name'] = $currentqueuename;
+			$newqueue['interface'] = $items[$level+2];
+			
+			if ($items[$level+3] == "bandwidth") {
+				$level += 2;
+			}
+			if ($items[$level+3] == "priority") {
+				$level += 2;
+			}
+			if ($items[$level+3] == "qlimit") {
+				$level += 2;
+			}
+			$tmp = $items[$level+3];
+			if (substr($tmp,strlen($tmp)-1) == "(") {
+				$newqueue['shapertype'] = substr($tmp, 0, strlen($tmp)-1);
+			}
+			
+			$interfacestats[$currentqueueif][$currentqueuename] = &$newqueue;
+			if (is_array($contains)) {
+				$newqueue['contains'] = $contains;
+			}
+		} elseif ($items[0] == "altq") {
+			unset($newqueue);
+			$newqueue = array();
+			$currentqueuename = convert_real_interface_to_friendly_interface_name($items[2]);
+			$currentqueueif = $items[2];
+			$newqueue['name'] = $currentqueuename;
+			$newqueue['interface'] = $items[2];
+			$interfacestats[$currentqueueif][$currentqueuename] = &$newqueue;
+		} else {
+			if ($items[3] == "pkts:") {
+				$newqueue["pkts"] = trim(substr($line, 10, 10));
+				$newqueue["bytes"] = trim(substr($line, 29, 10));
+				$newqueue["droppedpkts"] = trim(substr($line, 55, 6));
+				$newqueue["droppedbytes"] = trim(substr($line, 69, 6));
+			}
+			if ($items[3] == "qlength:") {
+				$subitems = explode("/", substr($line, 13, 8));
+				$newqueue["qlengthitems"] = trim($subitems[0]);
+				$newqueue["qlengthsize"] = trim($subitems[1]);
+				if (substr($line, 22, 8) == "borrows:") {
+					$newqueue["borrows"] = trim(substr($line, 31, 7));
+				}
+				if (substr($line, 39, 9) == "suspends:") {
+					$newqueue["suspends"] = trim(substr($line, 49, 7));
+				}
+			}
+		}
+	}
+	$result['interfacestats'] = $interfacestats;
+	return $result;
+}
 
 /*
  * I admit :) this is derived from xmlparse.inc StartElement()
diff --git a/src/usr/local/www/getqueuestats.php b/src/usr/local/www/getqueuestats.php
new file mode 100644
index 0000000000..ce4938ceb0
--- /dev/null
+++ b/src/usr/local/www/getqueuestats.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * getqueuestats.php
+ *
+ * part of pfSense (https://www.pfsense.org)
+ * Copyright (c) 2017 Rubicon Communications, LLC (Netgate)
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+##|+PRIV
+##|*IDENT=page-getqueuestats
+##|*NAME=AJAX: Get Queue Stats
+##|*DESCR=Allow access to the 'AJAX: Get Stats' page.
+##|*MATCH=getqueuestats.php*
+##|-PRIV
+
+header("Last-Modified: " . gmdate("D, j M Y H:i:s") . " GMT");
+header("Expires: " . gmdate("D, j M Y H:i:s", time()) . " GMT");
+header("Cache-Control: no-cache, no-store, must-revalidate"); // HTTP/1.1
+header("Pragma: no-cache"); // HTTP/1.0
+
+require_once("auth_check.inc");
+include_once("shaper.inc");
+
+if ($_REQUEST['format'] == "json") {
+	header("Content-type: application/json");
+	echo json_encode(get_queue_stats());
+}
\ No newline at end of file
diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php
index 6c1ce68c15..f7fb7afa2d 100644
--- a/src/usr/local/www/status_queues.php
+++ b/src/usr/local/www/status_queues.php
@@ -42,71 +42,11 @@ class QueueStats {
 	public $suspends;
 	public $drops;
 }
-if (!file_exists("{$g['varrun_path']}/qstats.pid") || !isvalidpid("{$g['varrun_path']}/qstats.pid")) {
-	/* Start in the background so we don't hang up the GUI */
-	mwexec_bg("/usr/local/sbin/qstats -p {$g['varrun_path']}/qstats.pid");
-	/* Give it a moment to start up */
-	sleep(1);
-}
-$fd = @fsockopen("unix://{$g['varrun_path']}/qstats");
-if (!$fd) {
-	$error = gettext("Something wrong happened during communication with stat gathering.");
-} else {
-	$stats = "";
-	while (!feof($fd)) {
-		$stats .= fread($fd, 4096);
-	}
-	fclose($fd);
-	@file_put_contents("{$g['tmp_path']}/qstats", $stats);
-	$altqstats = @parse_xml_config("{$g['tmp_path']}/qstats", array("altqstats"));
-	if ($altqstats == -1) {
-		$error = gettext("No queue statistics could be read.");
-	}
-}
-if ($_REQUEST['getactivity']) {
-	$statistics = array();
-	$bigger_stat = 0;
-	$stat_type = $_REQUEST['stats'];
-	/* build the queue stats. */
-	foreach ($altqstats['queue'] as $q) {
-		statsQueues($q);
-	}
-	/* calculate the bigger amount of packets or bandwidth being moved through all queues. */
-	if ($stat_type == "0") {
-		foreach ($statistics as $q) {
-			if ($bigger_stat < $q->pps) {
-				$bigger_stat = $q->pps;
-			}
-		}
-	} else {
-		foreach ($statistics as $q) {
-			if ($bigger_stat < $q->bandwidth) {
-				$bigger_stat = $q->bandwidth;
-			}
-		}
-	}
-	$finscript = "";
-	foreach ($statistics as $q) {
-		if ($stat_type == "0" && $bigger_stat != "0") {
-			$packet_s = round(100 * ($q->pps / $bigger_stat), 0);
-		} else if ($bigger_stat != "0") {
-			$packet_s = round(100 * ($q->bandwidth / $bigger_stat), 0);
-		} else {
-			$packet_s = 0;
-		}
-		$finscript .= "$('#queue{$q->queuename}width').css('width','{$packet_s}%');";
-		$finscript .= "$('#queue{$q->queuename}pps').val('" . number_format($q->pps, 1) . "');";
-		$finscript .= "$('#queue{$q->queuename}bps').val('" . format_bits($q->bandwidth) . "');";
-		$finscript .= "$('#queue{$q->queuename}borrows').val('{$q->borrows}');";
-		$finscript .= "$('#queue{$q->queuename}suspends').val('{$q->suspends}');";
-		$finscript .= "$('#queue{$q->queuename}drops').val('{$q->drops}');";
-		$finscript .= "$('#queue{$q->queuename}length').val('{$q->queuelength}');";
-	}
-	unset($statistics, $altqstats);
-	header("Content-type: text/javascript");
-	echo $finscript;
-	exit;
-}
+
+include_once("shaper.inc");
+
+$stats = get_queue_stats();
+
 $pgtitle = array(gettext("Status"), gettext("Queues"));
 $shortcut_section = "trafficshaper";
 include("head.inc");
@@ -121,11 +61,20 @@ if (!$error): ?>
 <form action="status_queues.php" method="post">
 <script type="text/javascript">
 //<![CDATA[
+var refreshrate = 1000;
+var queuestathistorylength = 0;
+var queuestathistory = [];
+var queuestatprevious = [];
+var timestampprevious;
+var graphstatmax = 0;
 events.push(function() {
+	$('#updatespeed').on('change', function() {
+		refreshrate = $("#updatespeed").val();
+	});
 
 	function getqueueactivity() {
-		var url = "/status_queues.php";
-		var pars = "getactivity=yes&stats=" + $("#selStatistic").val();
+		var url = "/getqueuestats.php";
+		var pars = "format=json";
 		$.ajax(
 			url,
 			{
@@ -134,15 +83,134 @@ events.push(function() {
 				complete: activitycallback
 			});
 	}
-
+	
+	function escapeStr(str) 
+	{
+		if (str)
+			return str.replace(/([ #;?%&,.+*~\':"!^$[\]()=>|\/@])/g,'\\$1');
+		return str;
+	}
+	
 	function activitycallback(transport) {
-		setTimeout(getqueueactivity, 5100);
+		setTimeout(getqueueactivity, refreshrate);
+		json = transport.responseJSON;
+		if (!json) {
+			return;
+		}
+		timestamp = json.timestamp;
+		timestampdiff = timestamp - timestampprevious;
+		$stattype = $('#selStatistic').val();
+		
+		interfacename_stats = [];
+		for (interfacename in json.interfacestats) {
+			var queueparents = [];
+			interface = json.interfacestats[interfacename];
+			interfacename_stats[interfacename] = [];
+			for (queuename in interface) {
+				queue = interface[queuename];
+				statqname = queue['name'] + queue['interface'];
+				
+				for(childnr in queue['contains']) {
+					child = queue['contains'][childnr];
+					if (!queueparents[child]) {
+						queueparents[child] = [];
+					}
+					queueparents[child] = queuename;
+				}
+				
+				if (queuestatprevious[statqname]) {
+					interfacename_stats[interfacename][statqname] = [];
+					pkts_ps = (queue['pkts'] - queuestatprevious[statqname]['pkts']) / timestampdiff
+					bytes_ps = (queue['bytes'] - queuestatprevious[statqname]['bytes']) / timestampdiff
+					droppedpkts = parseFloat(queue['droppedpkts']);
+					borrows = parseFloat(queue['borrows']);
+					suspends = parseFloat(queue['suspends']);
+					interfacename_stats[interfacename][statqname]['pkts_ps'] = pkts_ps;
+					interfacename_stats[interfacename][statqname]['bytes_ps'] = bytes_ps;
+					interfacename_stats[interfacename][statqname]['borrows'] = borrows;
+					interfacename_stats[interfacename][statqname]['suspends'] = suspends;
+					interfacename_stats[interfacename][statqname]['droppedpkts'] = droppedpkts;
+					interfacename_stats[interfacename][statqname]['qlengthitems'] = queue['qlengthitems'];
+					interfacename_stats[interfacename][statqname]['qlengthsize'] = queue['qlengthsize'];
+					find = queuename;
+					while(queueparents[find]) {
+						// add diff values also to parent queues
+						parentname = queueparents[find];
+						parentqueuename = parentname+interfacename;
+						interfacename_stats[interfacename][parentqueuename]['pkts_ps'] += pkts_ps;
+						interfacename_stats[interfacename][parentqueuename]['bytes_ps'] += bytes_ps;
+						interfacename_stats[interfacename][parentqueuename]['borrows'] += borrows;
+						interfacename_stats[interfacename][parentqueuename]['suspends'] += suspends;
+						interfacename_stats[interfacename][parentqueuename]['droppedpkts'] += droppedpkts;
+						find = parentname;
+					}
+				}
+				queuestatprevious[statqname] = queue; 
+			}
+		}
+		// Find max pps/bps needed for any scale bar
+		statmax = 0;
+		for (interfacename in interfacename_stats) {
+			interface = interfacename_stats[interfacename];
+			for (queuename in interface) {
+				queue = interface[queuename];
+				if ($stattype == "0") {
+					if (statmax < queue['pkts_ps']) {
+						statmax = queue['pkts_ps'];
+					}
+				} else {
+					if (statmax < queue['bytes_ps']) {
+						statmax = queue['bytes_ps'];
+					}
+				}
+			}
+		}
+		// use a slowly sliding max scale value but do make sure its always large enough to accomodate the largest value..
+		if (graphstatmax < statmax) {
+			// peek value + 10% keeps a little room for it to increase
+			graphstatmax = statmax * 1.1;
+		} else {
+			// in general make largest bar fill +- 2/3 of the scale
+			graphstatmax = (graphstatmax * 20 + statmax * 1.5) / 21;
+		}
+		// set values on the objects
+		for (interfacename in interfacename_stats) {
+			interface = interfacename_stats[interfacename];
+			for (queuename in interface) {
+				queue = interface[queuename];
+				statqname = escapeStr(queuename);
+				if ($stattype == "0") {
+					$('#queue'+statqname+'width').css('width', (queue['pkts_ps']*100/graphstatmax).toFixed(0) + '%');
+				} else {
+					$('#queue'+statqname+'width').css('width', (queue['bytes_ps']*100/graphstatmax).toFixed(0) + '%');
+				}
+				$('#queue'+statqname+'pps').val(queue['pkts_ps'].toFixed(1));
+				$('#queue'+statqname+'bps').val(formatSpeedBits(queue['bytes_ps']));
+				$('#queue'+statqname+'borrows').val(queue['borrows']);
+				$('#queue'+statqname+'suspends').val(queue['suspends']);
+				$('#queue'+statqname+'drops').val(queue['droppedpkts']);
+				$('#queue'+statqname+'length').val(queue['qlengthitems']+'/'+queue['qlengthsize']);
+			}
+		}
+		timestampprevious = timestamp;   
 	}
 
 	$(document).ready(function() {
 		setTimeout(getqueueactivity, 150);
 	});
 });
+
+function formatSpeedBits(speed) {
+	// format speed in bits/sec, input: bytes/sec
+	if (speed < 125000) {
+		return Math.round(speed / 125) + " <?=gettext("Kbps"); ?>";
+	}
+	if (speed < 125000000) {
+		return Math.round(speed / 1250)/100 + " <?=gettext("Mbps"); ?>";
+	}
+	// else
+	return Math.round(speed / 1250000)/100 + " <?=gettext("Gbps"); ?>";  /* wow! */
+}
 //]]>
 </script>
 <?php endif;
@@ -151,6 +219,20 @@ if ($error):
 	print_info_box($error);
 else: ?>
 	<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Settings"); ?></h2></div>
+		<div class="panel-body table-responsive">
+			<label class="col-sm-2 control-label">
+				<span>Refresh rate</span>
+			</label>
+			<div class="col-sm-10">
+				<select id="updatespeed" class="form-control">
+					<option value="500">0.5 <?=gettext("seconds");?></option>
+					<option value="1000" selected>1 <?=gettext("seconds");?></option>
+					<option value="2000">2 <?=gettext("seconds");?></option>
+					<option value="5000">5 <?=gettext("seconds");?></option>
+				</select>
+			</div>
+		</div>
 	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Status Queues"); ?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-striped table-hover">
@@ -174,7 +256,7 @@ else: ?>
 				<tbody>
 <?php
 	$if_queue_list = get_configured_interface_list_by_realif(true);
-	processQueues($altqstats, 0, "");
+	processInterfaceQueues($stats, 0, "");
 ?>
 <?php endif; ?>
 				</tbody>
@@ -182,7 +264,7 @@ else: ?>
 			<br />
 			<div class="infoblock blockopen">
 <?php
-	print_info_box(gettext("Queue graphs take 5 seconds to sample data."), 'info', false);
+	print_info_box(gettext("Queue graphs sample data on a regular interval."), 'info', false);
 ?>
 			</div>
 		</div>
@@ -206,59 +288,81 @@ else: ?>
 
 include("foot.inc");
 
-function processQueues($altqstats, $level, $parent_name) {
+function processInterfaceQueues($altqstats, $parent_name) {
 	global $g;
 	global $if_queue_list;
-
+	
 	$parent_name = $parent_name . " queuerow" . $altqstats['name'] . convert_real_interface_to_friendly_interface_name($altqstats['interface']);
 	$prev_if = $altqstats['interface'];
-	foreach ($altqstats['queue'] as $q) {
+	if (!is_array($altqstats['interfacestats'])) {
+		print("<tr><td>");
+		print("No Queue data available");
+		print("</td></tr>");
+		return;
+	}
+	foreach ($altqstats['interfacestats'] as $if => $ifq) {
+		$parents = array();
+		echo "<tr><td colspan=\"8\"><b>Interface " . htmlspecialchars(convert_real_interface_to_friendly_descr($if)) . "</b></td></tr>\n";
 		$if_name = "";
 		foreach ($if_queue_list as $oif => $real_name) {
-			if ($oif == $q['interface']) {
+			if ($oif == $if) {
 				$if_name = $real_name;
 				break;
 			}
 		}
 		if ($prev_if != $q['interface']) {
-			echo "<tr><td colspan=\"8\"><b>Interface " . htmlspecialchars(convert_real_interface_to_friendly_descr($q['interface'])) . "</b></td></tr>\n";
 			$prev_if = $q['interface'];
 		}
-		$qfinterface = convert_real_interface_to_friendly_interface_name($q['interface']);
-		$qname = str_replace($q['interface'], $qfinterface, $q['name']);
-
-?>
-		<tr class="<?=$parent_name;?>">
-			<td class="<?=$row_class?>" style="padding-left:<?=$level * 20?>px;">
-				<?php
-				if (is_array($q['queue'])) {
-					echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$qname}{$qfinterface}');return false\">+/-</a>";
+		foreach($ifq as $qkey => $q) {
+			$parent_name = $if . " queuerow" . $altqstats['name'] . convert_real_interface_to_friendly_interface_name($altqstats['interface']);
+			if (isset($q['contains'])) {
+				foreach($q['contains'] as $child) {
+					$parents[$child] = $qkey;
 				}
-				if (strstr($qname, "root_")) {
-					echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$if_name}&amp;action=show\">Root queue</a>";
-				} else {
-					echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$qname}&amp;action=show\">" . htmlspecialchars($qname) . "</a>";
-				}
-				?>
-			</td>
-<?php
-		$cpuUsage = 0;
-		print('<td>');
-		print('<div class="progress" style="height: 7px;width: 170px;">');
-		print('		<div class="progress-bar" role="progressbar" id="queue' . $qname . $qfinterface . 'width" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: ' . $cpuUsage*100 . '%;"></div>');
-		print('	  </div>');
-		print('</td>');
-		print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'pps"      id="queue' . $qname . $qfinterface . 'pps"      value="(' . gettext("Loading") . ')" /></td>');
-		print('<td><input readonly style="border:0;width:80px;text-align:right;" name="queue' . $qname . $qfinterface . 'bps"      id="queue' . $qname . $qfinterface . 'bps"      value="" /></td>');
-		print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'borrows"  id="queue' . $qname . $qfinterface . 'borrows"  value="" /></td>');
-		print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'suspends" id="queue' . $qname . $qfinterface . 'suspends" value="" /></td>');
-		print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'drops"    id="queue' . $qname . $qfinterface . 'drops"    value="" /></td>');
-		print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'length"   id="queue' . $qname . $qfinterface . 'length"   value="" /></td>');
+			}
+			$find = $qkey;
+			$level = 0;
+			while(isset($parents[$find])) {
+				$find = $parents[$find];
+				$level++;
+				$parent_name = $parent_name . " queuerow" . $find . $q['interface'];
+			}
+			$qfinterface = convert_real_interface_to_friendly_interface_name($q['interface']);
+			$qname = str_replace($q['interface'], $qfinterface, $q['name']);
 ?>
-		</tr>
+			<tr class="<?=$parent_name;?>">
+				<td class="<?=$row_class?>" style="padding-left:<?=$level * 20?>px;">
+					<?php
+					if (is_array($q['contains'])) {
+						echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$qname}{$qfinterface}');return false\">+/-</a>";
+					}
+					if (strstr($qname, "root_")) {
+						echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$if_name}&amp;action=show\">Root queue</a>";
+					} else {
+						echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$qname}&amp;action=show\">" . htmlspecialchars($qname) . "</a>";
+					}
+					?>
+				</td>
 <?php
-		if (is_array($q['queue'])) {
-			processQueues($q, $level + 1, $parent_name);
+			$cpuUsage = 0;
+			$stat_prefix = "queue" . $q['name'] . $q['interface'];
+			print('<td>');
+			print('<div class="progress" style="height: 7px;width: 170px;">');
+			print('		<div class="progress-bar" role="progressbar" id="' . $stat_prefix . 'width" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: ' . $cpuUsage*100 . '%;"></div>');
+			print('	  </div>');
+			print('</td>');
+			print('<td><input readonly style="border:0;width:70px;text-align:right;" name="' . $stat_prefix . 'pps"      id="' . $stat_prefix . 'pps"      value="(' . gettext("Loading") . ')" /></td>');
+			print('<td><input readonly style="border:0;width:80px;text-align:right;" name="' . $stat_prefix . 'bps"      id="' . $stat_prefix . 'bps"      value="" /></td>');
+			print('<td><input readonly style="border:0;width:70px;text-align:right;" name="' . $stat_prefix . 'borrows"  id="' . $stat_prefix . 'borrows"  value="" /></td>');
+			print('<td><input readonly style="border:0;width:70px;text-align:right;" name="' . $stat_prefix . 'suspends" id="' . $stat_prefix . 'suspends" value="" /></td>');
+			print('<td><input readonly style="border:0;width:70px;text-align:right;" name="' . $stat_prefix . 'drops"    id="' . $stat_prefix . 'drops"    value="" /></td>');
+			print('<td><input readonly style="border:0;width:70px;text-align:right;" name="' . $stat_prefix . 'length"   id="' . $stat_prefix . 'length"   value="" /></td>');
+?>
+			</tr>
+<?php
+			if (is_array($q['queue'])) {
+				processInterfaceQueues($q, $level + 1, $parent_name);
+			}
 		}
 	};
 }