diff --git a/html/graph.php b/html/graph.php
index 3dd2d5945..50a30edf5 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -44,7 +44,15 @@
   $os = gethostosbyid($device_id);
 
   switch ($type) {
-
+  case 'fortigate_sessions':
+    $graph = graph_fortigate_sessions ($hostname . "/fortigate-sessions.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    break;
+  case 'fortigate_cpu':
+    $graph = graph_fortigate_cpu ($hostname . "/fortigate-cpu.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    break;
+  case 'fortigate_memory':
+    $graph = graph_fortigate_memory ($hostname . "/fortigate-memory.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
+    break;
   case 'netscreen_sessions':
     $graph = graph_netscreen_sessions ($hostname . "/netscreen-sessions.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
     break;
diff --git a/html/pages/device/dev-graphs.inc b/html/pages/device/dev-graphs.inc
index f02c1b38c..c8bdafe22 100644
--- a/html/pages/device/dev-graphs.inc
+++ b/html/pages/device/dev-graphs.inc
@@ -8,17 +8,22 @@ while($device = mysql_fetch_array($device_query)) {
    echo("<div style='clear: both;'>");
 
    switch ($device['os']) {
-   case "ScreenOS":
+   case "Fortigate":
+      echo("<div class=graphhead>Processor Utilisation</div>");
+      $graph_type = "fortigate_cpu";            include ("includes/print-device-graph.php");
+      echo("<div class=graphhead>Memory Usage</div>");
+      $graph_type = "fortigate_memory";         include ("includes/print-device-graph.php");
+      echo("<div class=graphhead>Firewall Sessions</div>");
+      $graph_type = "fortigate_sessions";       include ("includes/print-device-graph.php");
+      break;
 
+   case "ScreenOS":
       echo("<div class=graphhead>Processor Utilisation</div>");
       $graph_type = "netscreen_cpu";            include ("includes/print-device-graph.php");
-
       echo("<div class=graphhead>Memory Usage</div>");
       $graph_type = "netscreen_memory";        	include ("includes/print-device-graph.php");
-
       echo("<div class=graphhead>Firewall Sessions</div>");
       $graph_type = "netscreen_sessions";       include ("includes/print-device-graph.php");
-
       break;
 
    case "ProCurve":
diff --git a/includes/discovery/interfaces.php b/includes/discovery/interfaces.php
index d8c776752..69f2529a3 100755
--- a/includes/discovery/interfaces.php
+++ b/includes/discovery/interfaces.php
@@ -33,10 +33,15 @@
           mysql_query("INSERT INTO `interfaces` (`device_id`,`ifIndex`,`ifDescr`) VALUES ('".$device['device_id']."','$ifIndex','$ifName')");
           # Add Interface
            echo("+");
-        } else { 
-          # Interface Already Exists
-          echo(".");
+        } else {
+          mysql_query("UPDATE `interfaces` SET `deleted` = '0' WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '$ifIndex' AND `deleted` = '1'"); 
+          if(mysql_affected_rows()) { 
+            echo("*"); 
+          } else {
+            echo(".");
+          }
         }
+        $int_exists[] = "$ifIndex";
       } else { 
           # Ignored ifName
           echo("X"); 
@@ -44,6 +49,25 @@
     } 
   }
 
+
+  $sql = "SELECT * FROM `interfaces` WHERE `device_id`  = '".$device['device_id']."' AND `deleted` = '0'";
+  $query = mysql_query($sql);
+
+  while ($test_if = mysql_fetch_array($query)) {
+        unset($exists);
+        $i = 0;
+        while ($i < count($int_exists) && !$exists) {
+            $this_if = $test_if['ifIndex'];
+            if ($int_exists[$i] == $this_if) { $exists = 1; }
+            $i++;
+        }
+        if(!$exists) {
+          echo("-");
+          mysql_query("UPDATE `interfaces` SET `deleted` = '1' WHERE interface_id = '" . $test_if['interface_id'] . "'");
+        }
+  }
+
+  unset($temp_exists);
   echo("\n");
 
 ?>
diff --git a/includes/graphing.php b/includes/graphing.php
index 2b789a98c..0c2ade7a9 100644
--- a/includes/graphing.php
+++ b/includes/graphing.php
@@ -1,6 +1,7 @@
 <?php
 
 include("graphing/screenos.php");
+include("graphing/fortigate.php");
 
 function graph_multi_bits ($interfaces, $graph, $from, $to, $width, $height) {
   global $config, $rrdtool, $installdir, $mono_font;
diff --git a/includes/osdiscovery/discover-screenos.php b/includes/osdiscovery/discover-screenos.php
index 2bba100aa..fe982e4a2 100755
--- a/includes/osdiscovery/discover-screenos.php
+++ b/includes/osdiscovery/discover-screenos.php
@@ -2,7 +2,7 @@
 
 if(!$os) {
 
-  $sysObjectId = shell_exec($config['snmpget'] . " -Ovq -m ".$config['mibs_dir']."/NS-PRODUCTS.mib -v2c -c ". $community ." ". $hostname ." .1.3.6.1.2.1.1.2.0");
+  $sysObjectId = shell_exec($config['snmpget'] . " -Ovq -v2c -c ". $community ." ". $hostname ." .1.3.6.1.2.1.1.2.0");
   if(strstr($sysObjectId, "netscreen")) { $os = "ScreenOS"; }
 
 }
diff --git a/includes/polling/device-screenos.inc.php b/includes/polling/device-screenos.inc.php
index 4ae4cca78..351ad3e5a 100755
--- a/includes/polling/device-screenos.inc.php
+++ b/includes/polling/device-screenos.inc.php
@@ -1,6 +1,10 @@
 <?
 
-echo("Doing Juniper Netscreen ScreenOS");
+echo("Doing Juniper Netscreen (ScreenOS)");
+
+$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "Juniper Netscreen \\1||\\2||\\3||\\4", $sysDescr);
+echo("$version\n");
+list($hardware,$version,$serial,$features) = explode("||", $version);
 
 $cpurrd   = $rrd_dir . "/" . $device['hostname'] . "/netscreen-cpu.rrd";
 $memrrd   = $rrd_dir . "/" . $device['hostname'] . "/netscreen-memory.rrd";
diff --git a/poll-device.php b/poll-device.php
index f27ee1142..62bfe0ccc 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -66,10 +66,7 @@ while ($device = mysql_fetch_array($device_query)) {
       $ciscomodel = str_replace("\"", "", trim(`$snmp_cmdb`));
     } else { unset($ciscomodel); }
 
-    echo("$snmp_cmd \n");
-
     $snmpdata = shell_exec($snmp_cmd);
-    echo("completed");
     $snmpdata = preg_replace("/^.*IOS/","", $snmpdata);
     $snmpdata = trim($snmpdata);
     $snmpdata = str_replace("\"", "", $snmpdata);
@@ -139,12 +136,13 @@ while ($device = mysql_fetch_array($device_query)) {
       break;
 
     case "ScreenOS":
-      $version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "Juniper Netscreen \\1||\\2||\\3||\\4", $sysDescr);
-      echo("$version\n");
-      list($hardware,$version,$serial,$features) = explode("||", $version);
       include("includes/polling/device-screenos.inc.php");
       break;
 
+    case "Fortigate":
+      include("includes/polling/device-fortigate.inc.php");
+      break;
+
     case "IOS":
       $version = str_replace("Cisco IOS Software,", "", $sysDescr);
       $version = str_replace("IOS (tm) ", "", $version);