diff --git a/includes/discovery/current/sentry3.inc.php b/includes/discovery/current/sentry3.inc.php
new file mode 100644
index 000000000..12023117d
--- /dev/null
+++ b/includes/discovery/current/sentry3.inc.php
@@ -0,0 +1,90 @@
+<?php
+
+global $valid_sensor;
+
+if ($device['os'] == 'sentry3')
+{
+  $oids = snmp_walk($device, "infeedPower", "-Osqn", "Sentry3-MIB");
+  $tower_count = snmp_get($device,"systemTowerCount.0", "-Ovq", "Sentry3-MIB");
+
+  $towers=1;
+  while($towers <= $tower_count) {
+
+    $divisor = "10";
+    $outlet_divisor = "100";
+    $multiplier = "1";
+    if ($debug) { echo($oids."\n"); }
+    $oids = trim($oids);
+    if ($oids) echo("ServerTech Sentry Infeed ");
+    foreach (explode("\n", $oids) as $data)
+    {
+      $data = trim($data);
+      if ($data)
+      {
+        list($oid,$descr) = explode(" ", $data,2);
+        $split_oid = explode('.',$oid);
+        $index = $split_oid[count($split_oid)-1];
+
+        #infeedLoadValue
+        $infeed_oid      = "1.3.6.1.4.1.1718.3.2.2.1.7." . $towers . "." . $index;
+
+        $descr_string    = snmp_get($device,"infeedID.$towers.$index", "-Ovq", "Sentry3-MIB");
+        #$descr           = "Infeed " . $towers . " " . $descr_string;
+        $descr           = "Infeed $descr_string";
+        $low_warn_limit  = "0";
+        $low_limit       = "0";
+        $high_warn_limit = snmp_get($device,"infeedLoadHighThresh.$towers.$index", "-Ovq", "Sentry3-MIB");
+        $high_limit      = snmp_get($device,"infeedCapacity.$towers.$index", "-Ovq", "Sentry3-MIB");
+        $current         = snmp_get($device,"$infeed_oid", "-Ovq", "Sentry3-MIB") / $divisor;
+
+        discover_sensor($valid_sensor, 'current', $device, $infeed_oid, $index, 'sentry3', $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $high_warn_limit, $high_limit, $current);
+
+        # Check for per-outlet polling
+        $outlet_oids = snmp_walk($device, "outletLoadValue.$towers.$index", "-Osqn", "Sentry3-MIB");
+        $outlet_oids = trim($outlet_oids);
+        if ($outletoids) echo("ServerTech Sentry Outlet ");
+        foreach (explode("\n", $outlet_oids) as $outlet_data)
+        {
+          $data = trim($outlet_data);
+          if ($outlet_data)
+          {
+            list($outlet_oid,$outlet_descr) = explode(" ", $outlet_data,2);
+            $outlet_split_oid = explode('.',$outlet_oid);
+            $outlet_index = $outlet_split_oid[count($outlet_split_oid)-1];
+
+            $outletsuffix = "$towers.$index.$outlet_index";
+            $outlet_insert_index=$index . $outlet_index;
+
+            #outletLoadValue
+            $outlet_oid             = "1.3.6.1.4.1.1718.3.2.3.1.7.$outletsuffix";
+            $outlet_descr_string    = snmp_get($device,"outletID.$outletsuffix", "-Ovq", "Sentry3-MIB");
+            $outlet_descr           = "Outlet $outlet_descr_string";
+            $outlet_low_warn_limit  = "0";
+            $outlet_low_limit       = "0";
+            $outlet_high_warn_limit = snmp_get($device,"outletLoadHighThresh.$outletsuffix", "-Ovq", "Sentry3-MIB");
+            $outlet_high_limit      = snmp_get($device,"outletCapacity.$outletsuffix", "-Ovq", "Sentry3-MIB");
+            $outlet_current         = snmp_get($device,"$outlet_oid", "-Ovq", "Sentry3-MIB") / $outlet_divisor;
+
+            discover_sensor($valid_sensor, 'current', $device, $outlet_oid, $outlet_insert_index, 'sentry3', $outlet_descr, $outlet_divisor, $multiplier, $outlet_low_limit, $outlet_low_warn_limit, $outlet_high_warn_limit, $outlet_high_limit, $outlet_current);
+
+          } // if ($outlet_data)
+
+        } // foreach (explode("\n", $outlet_oids) as $outlet_data)
+
+        unset($outlet_oids);
+        unset($outlet_data);
+
+      } //if($data)
+
+      unset($data);
+
+    } //foreach (explode("\n", $oids) as $data)
+
+    unset($oids);
+    $towers++;
+
+  } // while($towers <= $tower_count)
+
+}
+
+?>
diff --git a/includes/discovery/os/alcatel-lucent.inc.php b/includes/discovery/os/alcatel-lucent.inc.php
new file mode 100755
index 000000000..310868ac2
--- /dev/null
+++ b/includes/discovery/os/alcatel-lucent.inc.php
@@ -0,0 +1,12 @@
+<?php
+
+# | Alcatel-Lucent OS6850-U24X 6.4.3.520.R01 GA, April 08, 2010. | .1.3.6.1.4.1.6486.800.1.1.2.1.7.1.10 |
+
+if (!$os)
+{
+  if (strpos($sysObjectId, ".1.3.6.1.4.1.6527.1.800") != FALSE) { $os = "aos"; }
+  if (strpos($sysObjectId, ".1.3.6.1.4.1.6527.1.3") != FALSE) { $os = "timos"; }
+}
+
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 1ab0eabb3..373e511c8 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -81,6 +81,20 @@ $config['os'][$os]['type']              = "server";
 $config['os'][$os]['group']             = "unix";
 $config['os'][$os]['text']              = "OpenIndiana";
 
+$os = "aos";
+$config['os'][$os]['group']             = "aos";
+$config['os'][$os]['text']              = "Alcatel-Lucent OS";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['ifXmcbc']           = 1;
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+#$config['os'][$os]['over'][1]['graph']  = "device_processors";
+#$config['os'][$os]['over'][1]['text']   = "CPU Usage";
+#$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+#$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+#$config['os'][$os]['icon']              = "cisco";
+
+
 $os = "ios";
 $config['os'][$os]['group']		= "ios";
 $config['os'][$os]['text']		= "Cisco IOS";
@@ -94,7 +108,6 @@ $config['os'][$os]['over'][2]['graph']	= "device_mempools";
 $config['os'][$os]['over'][2]['text']	= "Memory Usage";
 $config['os'][$os]['icon']              = "cisco";
 
-
 $os = "cat1900";
 $config['os'][$os]['group']		= "cat1900";
 $config['os'][$os]['text']		= "Cisco Catalyst 1900";
@@ -430,7 +443,7 @@ $config['os'][$os]['type']     		= "network";
 $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Traffic";
 
-$os = "sonicwal";
+$os = "sonicwall";
 $config['os'][$os]['text']     		= "SonicWALL";
 $config['os'][$os]['type']     		= "firewall";
 $config['os'][$os]['over'][0]['graph'] 	= "device_bits";