diff --git a/html/graph.php b/html/graph.php
index 1178ae1f7..5f3243ca9 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -49,7 +49,7 @@ if($_GET['debug']) {
   }
 
   if($rrd_options) {
-#    echo("<pre>".$config['rrdtool'] . " graph $graphfile $rrd_options");
+    #echo("<pre>".$config['rrdtool'] . " graph $graphfile $rrd_options");
     $thing = shell_exec($config['rrdtool'] . " graph $graphfile $rrd_options");
     if(is_file($graphfile)) {
       header('Content-type: image/png');
diff --git a/includes/polling/bgpPeer.inc.php b/includes/polling/bgpPeer.inc.php
index df4e6e810..d89fcd1ac 100755
--- a/includes/polling/bgpPeer.inc.php
+++ b/includes/polling/bgpPeer.inc.php
@@ -30,7 +30,12 @@ while($peer = mysql_fetch_array($peers)) {
       RRA:AVERAGE:0.5:1:600 \
       RRA:AVERAGE:0.5:6:700 \
       RRA:AVERAGE:0.5:24:775 \
-      RRA:AVERAGE:0.5:288:797");
+      RRA:AVERAGE:0.5:288:797 \
+      RRA:MAX:0.5:1:600 \
+      RRA:MAX:0.5:6:700 \
+      RRA:MAX:0.5:24:775 \
+      RRA:MAX:0.5:288:797");
+
   }
   rrdtool_update("$peerrrd", "N:$bgpPeerOutUpdates:$bgpPeerInUpdates:$bgpPeerOutTotalMessages:$bgpPeerInTotalMesages:$bgpPeerFsmEstablishedTime");
   $update  = "UPDATE bgpPeers SET bgpPeerState = '$bgpPeerState', bgpPeerAdminStatus = '$bgpPeerAdminStatus', ";
@@ -87,7 +92,11 @@ while($peer = mysql_fetch_array($peers)) {
          RRA:AVERAGE:0.5:1:600 \
          RRA:AVERAGE:0.5:6:700 \
          RRA:AVERAGE:0.5:24:775 \
-         RRA:AVERAGE:0.5:288:797");
+         RRA:AVERAGE:0.5:288:797 \
+         RRA:MAX:0.5:1:600 \
+         RRA:MAX:0.5:6:700 \
+         RRA:MAX:0.5:24:775 \
+         RRA:MAX:0.5:288:797");
      }
      rrdtool_update("$cbgp_rrd", "N:$cbgpPeerAcceptedPrefixes:$cbgpPeerDeniedPrefixes:$cbgpPeerAdvertisedPrefixes:$cbgpPeerSuppressedPrefixes:$cbgpPeerWithdrawnPrefixes");
    }
diff --git a/includes/polling/device-netstats.inc.php b/includes/polling/device-netstats.inc.php
index f2f48e98d..878195593 100755
--- a/includes/polling/device-netstats.inc.php
+++ b/includes/polling/device-netstats.inc.php
@@ -3,37 +3,58 @@
 if($device[os] != "Snom") {
 
   echo("Polling device network statistics...\n");
-  unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
 
-  $oids = array ('ipForwDatagrams','ipInDelivers','ipInReceives','ipOutRequests','ipInDiscards','ipOutDiscards','ipOutNoRoutes',
-                 'icmpInMsgs','icmpOutMsgs','icmpInErrors','icmpOutErrors','icmpInEchos','icmpOutEchos','icmpInEchoReps',
-                 'icmpOutEchoReps','snmpInTotalReqVars','snmpInTotalSetVars','snmpInTraps','snmpOutTraps','snmpInPkts',
-                 'snmpOutPkts','snmpOutGetResponses','snmpOutSetRequests','tcpActiveOpens','tcpPassiveOpens','tcpAttemptFails',
-                 'tcpEstabResets','tcpInSegs','tcpOutSegs','tcpRetransSegs','udpInDatagrams','udpOutDatagrams','udpInErrors',
-                 'udpNoPorts');
+  $oids['ip'] = array ('ipForwDatagrams','ipInDelivers','ipInReceives','ipOutRequests','ipInDiscards','ipOutDiscards','ipOutNoRoutes',
+                 'ipReasmReqds','ipReasmOKs','ipReasmFails','ipFragOKs','ipFragFails','ipFragCreates', 'ipInUnknownProtos',
+                 'ipInHdrErrors', 'ipInAddrErrors');
 
-  $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/netinfo.rrd";
+  $oids['icmp'] =   array('icmpInMsgs','icmpOutMsgs','icmpInErrors','icmpOutErrors','icmpInEchos','icmpOutEchos','icmpInEchoReps',
+                 'icmpOutEchoReps','icmpInDestUnreachs','icmpOutDestUnreachs','icmpInParmProbs','icmpInTimeExcds',
+                 'icmpInSrcQuenchs','icmpInRedirects','icmpInTimestamps','icmpInTimestampReps','icmpInAddrMasks',
+                 'icmpInAddrMaskReps','icmpOutTimeExcds','icmpOutParmProbs','icmpOutSrcQuenchs','icmpOutRedirects',
+                 'icmpOutTimestamps','icmpOutTimestampReps','icmpOutAddrMasks','icmpOutAddrMaskReps');
 
-  $rrd_create = $config['rrdtool'] . " create $rrdfile ";
-  $rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \
-                  RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:797";
+  $oids['snmp'] = array ('snmpInPkts','snmpOutPkts','snmpInBadVersions','snmpInBadCommunityNames','snmpInBadCommunityUses','snmpInASNParseErrs',
+'snmpInTooBigs','snmpInNoSuchNames','snmpInBadValues','snmpInReadOnlys','snmpInGenErrs','snmpInTotalReqVars','snmpInTotalSetVars',
+'snmpInGetRequests','snmpInGetNexts','snmpInSetRequests','snmpInGetResponses','snmpInTraps','snmpOutTooBigs','snmpOutNoSuchNames',
+'snmpOutBadValues','snmpOutGenErrs','snmpOutGetRequests','snmpOutGetNexts','snmpOutSetRequests','snmpOutGetResponses','snmpOutTraps',
+'snmpEnableAuthenTraps','snmpSilentDrops','snmpProxyDrops');
 
-  foreach($oids as $oid){
-    $rrd_create .= " DS:$oid:COUNTER:600:U:100000000000";
-    $snmpstring .= " $oid.0"; 
+  $oids['tcp'] = array ('tcpRtoMin', 'tcpRtoMax', 'tcpMaxConn', 'tcpActiveOpens', 'tcpPassiveOpens', 'tcpAttemptFails', 'tcpEstabResets', 'tcpCurrEstab', 
+'tcpInSegs', 'tcpOutSegs', 'tcpRetransSegs', 'tcpInErrs', 'tcpOutRsts', 'tcpHCInSegs', 'tcpHCOutSegs');
+
+  $oids['udp'] = array ('udpInDatagrams','udpOutDatagrams','udpInErrors','udpNoPorts');
+
+  $protos = array('ip','icmp', 'snmp', 'udp', 'tcp');
+
+  foreach($protos as $proto) {
+    unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
+    $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/netstats-".$proto.".rrd";
+
+    $rrd_create = $config['rrdtool'] . " create $rrdfile ";
+    $rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \
+                    RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:797";
+
+    foreach($oids[$proto] as $oid){
+      $oid_ds = truncate($oid, 19, '');
+      echo("\n$oid");
+      $rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000";
+      $snmpstring .= " $oid.0"; 
+    }
+
+    if(!file_exists($rrdfile)) {  shell_exec($rrd_create); }
+
+    $snmpdata_cmd = "snmpget -m IP-MIB:SNMPv2-MIB:UDP-MIB:TCP-MIB:IP-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " $snmpstring";
+    $snmpdata     = trim(shell_exec($snmpdata_cmd));
+    $rrdupdate = "N";
+    foreach(explode("\n", $snmpdata) as $data) {
+      if(strstr($data, "No") || strstr($data, "d") || strstr($data, "s")) { $data = ""; }
+      $rrdupdate .= ":$data";
+    }
+    unset($snmpstring);
+    rrdtool_update($rrdfile, $rrdupdate);
   }
 
-  if(!file_exists($rrdfile)) { 
-    shell_exec($rrd_create); 
-  }
-  $snmpdata_cmd = "snmpget -m IP-MIB:SNMPv2-MIB:UDP-MIB:TCP-MIB:IP-MIB -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'].":".$device['port'] . " $snmpstring";
-  $snmpdata     = trim(`$snmpdata_cmd`);
-  $rrdupdate = "N";
-  foreach(explode("\n", $snmpdata) as $data) {
-    if(strstr($data, "No") || strstr($data, "d") || strstr($data, "s")) { $data = ""; }
-    $rrdupdate .= ":$data";
-  }
-  rrdtool_update($rrdfile, $rrdupdate);
 }
 
 ?>