diff --git a/html/images/os/arubaos.png b/html/images/os/arubaos.png
new file mode 100644
index 0000000000..70bacaaa2c
Binary files /dev/null and b/html/images/os/arubaos.png differ
diff --git a/html/images/os/panos.png b/html/images/os/panos.png
new file mode 100644
index 0000000000..b48073e05e
Binary files /dev/null and b/html/images/os/panos.png differ
diff --git a/html/includes/graphs/device/panos_sessions.inc.php b/html/includes/graphs/device/panos_sessions.inc.php
new file mode 100644
index 0000000000..789008bacd
--- /dev/null
+++ b/html/includes/graphs/device/panos_sessions.inc.php
@@ -0,0 +1,20 @@
+<?php
+
+$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("panos-sessions.rrd");
+
+include("includes/graphs/common.inc.php");
+
+$ds = "sessions";
+
+$colour_area = "9999cc";
+$colour_line = "0000cc";
+
+$colour_area_max = "9999cc";
+
+$graph_max = 1;
+
+$unit_text = "Sessions";
+
+include("includes/graphs/generic_simplex.inc.php");
+
+?>
diff --git a/includes/discovery/os/arubaos.inc.php b/includes/discovery/os/arubaos.inc.php
new file mode 100644
index 0000000000..f453e2a470
--- /dev/null
+++ b/includes/discovery/os/arubaos.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os)
+{
+  if (strstr($sysDescr, "ArubaOS")) { $os = "arubaos"; }
+}
+
+?>
diff --git a/includes/discovery/os/panos.inc.php b/includes/discovery/os/panos.inc.php
new file mode 100644
index 0000000000..b0c9159ca2
--- /dev/null
+++ b/includes/discovery/os/panos.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os)
+{
+  if (strstr($sysDescr, "Palo Alto Networks")) { $os = "panos"; }
+}
+
+?>
diff --git a/includes/polling/os/arubaos.inc.php b/includes/polling/os/arubaos.inc.php
new file mode 100644
index 0000000000..4617c32ea4
--- /dev/null
+++ b/includes/polling/os/arubaos.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+// ArubaOS (MODEL: Aruba3600), Version 6.1.2.2 (29541)
+$badchars = array("(", ")", ",");
+list(,,$hardware,,$version,) = str_replace($badchars, "", explode (" ", $poll_device[sysDescr]));
+
+?>
diff --git a/includes/polling/os/panos.inc.php b/includes/polling/os/panos.inc.php
new file mode 100644
index 0000000000..6c31b3b3c8
--- /dev/null
+++ b/includes/polling/os/panos.inc.php
@@ -0,0 +1,24 @@
+<?php
+
+$hardware = trim(snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.2.1.0", "-OQv", "", ""),'" ');
+$version = trim(snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.1.1.0", "-OQv", "", ""),'" ');
+$serial = trim(snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.1.3.0", "-OQv", "", ""),'" ');
+
+# list(,,,$hardware) = explode (" ", $poll_device[sysDescr]);
+
+$sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/panos-sessions.rrd";
+$sessions = snmp_get($device, "1.3.6.1.4.1.25461.2.1.2.3.3.0", "-Ovq");
+
+if (is_numeric($sessions))
+{
+  if (!is_file($sessrrd))
+  {
+    rrdtool_create($sessrrd," --step 300 DS:sessions:GAUGE:600:0:3000000 \
+     RRA:AVERAGE:0.5:1:800 RRA:AVERAGE:0.5:6:800 RRA:AVERAGE:0.5:24:800 RRA:AVERAGE:0.5:288:800 \
+     RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800");
+  }
+  rrdtool_update($sessrrd,"N:$sessions");
+  $graphs['panos_sessions'] = TRUE;
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 3de403acd5..95f9a35338 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -801,6 +801,15 @@ $config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 $config['os'][$os]['icon']              = "watchguard";
 
+$os = "panos";
+$config['os'][$os]['text']              = "PanOS";
+$config['os'][$os]['type']              = "firewall";
+$config['os'][$os]['icon']              = "panos";
+
+$os = "arubaos";
+$config['os'][$os]['text']              = "ArubaOS";
+$config['os'][$os]['type']              = "wireless";
+$config['os'][$os]['icon']              = "arubaos";
 
 foreach ($config['os'] as $this_os => $blah)
 {
@@ -849,6 +858,9 @@ $config['graph_types']['device']['fortigate_sessions']['descr'] = 'Active Sessio
 $config['graph_types']['device']['screenos_sessions']['section'] = 'firewall';
 $config['graph_types']['device']['screenos_sessions']['order'] = '0';
 $config['graph_types']['device']['screenos_sessions']['descr'] = 'Active Sessions';
+$config['graph_types']['device']['panos_sessions']['section'] = 'firewall';
+$config['graph_types']['device']['panos_sessions']['order'] = '0';
+$config['graph_types']['device']['panos_sessions']['descr'] = 'Active Sessions';
 
 $config['graph_types']['device']['bits']['section'] = 'netstats';
 $config['graph_types']['device']['bits']['order'] = '0';