diff --git a/discovery.php b/discovery.php
index 8295939b54..cdd5a96c9b 100755
--- a/discovery.php
+++ b/discovery.php
@@ -68,7 +68,7 @@ if (file_exists('.svn'))
   }
 
   if($db_rev+0 < 1656) { //FIXME
-     include('fix-port-rrd.php');
+     include('fix-port-rrd.php'); ## Rewrites all port RRDs. Nothing will work without this after 1656
   }
 
   if ($dbu_rev+0 > $db_rev)
diff --git a/html/includes/graphs/port/nupkts.inc.php b/html/includes/graphs/port/nupkts.inc.php
index 00ceb4eb82..da23fbbc9a 100644
--- a/html/includes/graphs/port/nupkts.inc.php
+++ b/html/includes/graphs/port/nupkts.inc.php
@@ -5,16 +5,25 @@ if(1)
 
   $rrd_list[1]['filename'] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
   $rrd_list[1]['descr'] = $int['ifDescr'];
-  $rrd_list[1]['rra_in'] = "InBroadcastPkts";
-  $rrd_list[1]['rra_out'] = "OutBroadcastPkts";
-  $rrd_list[1]['descr']   = "Broadcast";
+  $rrd_list[1]['rra_in'] = "INNUCASTPKTS";
+  $rrd_list[1]['rra_out'] = "OUTNUCASTPKTS";
+  $rrd_list[1]['descr']   = "NonUnicast";
   $rrd_list[1]['colour_area_in'] = "BB77BB";
   $rrd_list[1]['colour_area_out'] = "FFDD88";
 
+
+  $rrd_list[2]['filename'] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
+  $rrd_list[2]['descr'] = $int['ifDescr'];
+  $rrd_list[2]['rra_in'] = "INBROADCASTPKTS";
+  $rrd_list[2]['rra_out'] = "OUTBROADCASTPKTS";
+  $rrd_list[2]['descr']   = "Broadcast";
+  $rrd_list[2]['colour_area_in'] = "aa77BB";
+  $rrd_list[2]['colour_area_out'] = "eeDD88";
+
   $rrd_list[4]['filename'] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd");
   $rrd_list[4]['descr'] = $int['ifDescr'];
-  $rrd_list[4]['rra_in'] = "InMulticastPkts";
-  $rrd_list[4]['rra_out'] = "OutMulticastPkts";
+  $rrd_list[4]['rra_in'] = "INMULTICASTPKTS";
+  $rrd_list[4]['rra_out'] = "OUTMULTICASTPKTS";
   $rrd_list[4]['descr']   = "Multicast";
   $rrd_list[4]['colour_area_in'] = "805080";
   $rrd_list[4]['colour_area_out'] = "c0a060";
@@ -22,9 +31,9 @@ if(1)
   $units='';
   $units_descr='Packets/sec';
   $total_units='B';
-  $colours_in='greens';
+  $colours_in='purples';
   $multiplier = "1";
-  $colours_out = 'blues';
+  $colours_out = 'oranges';
 
   $nototal = 1;