diff --git a/includes/discovery/sensors/fanspeeds/nos.inc.php b/includes/discovery/sensors/fanspeeds/nos.inc.php
new file mode 100644
index 0000000000..cbdbeceb9a
--- /dev/null
+++ b/includes/discovery/sensors/fanspeeds/nos.inc.php
@@ -0,0 +1,23 @@
+<?php
+
+if ($device['os'] == "nos") {
+    $oids = snmp_walk($device, '1.3.6.1.4.1.1588.2.1.1.1.1.22.1.2', '-Osqn');
+    $oids = trim($oids);
+    foreach (explode("\n", $oids) as $data)
+    {
+        $data = trim($data);
+        if ($data AND $data[37] == "2")
+        {
+            $value_oid = ".1.3.6.1.4.1.1588.2.1.1.1.1.22.1.4.".$data[35];
+            $descr_oid = ".1.3.6.1.4.1.1588.2.1.1.1.1.22.1.5.".$data[35];
+            $value = snmp_get($device, $value_oid, '-Oqv');
+            $descr = snmp_get($device, $descr_oid, '-Oqv');
+            if (!strstr($descr, 'No') AND !strstr($value, 'No'))
+            {
+                $descr = str_replace('"', '', $descr);
+                $descr = trim($descr);
+                discover_sensor($valid['sensor'], 'temperature', $device, $value_oid, $data[35], 'nos', $descr, '1', '1', null, null, '80', '100');
+            }
+        }
+    }
+}
diff --git a/includes/discovery/sensors/temperatures/nos.inc.php b/includes/discovery/sensors/temperatures/nos.inc.php
new file mode 100644
index 0000000000..4eea893d37
--- /dev/null
+++ b/includes/discovery/sensors/temperatures/nos.inc.php
@@ -0,0 +1,23 @@
+<?php
+
+if ($device['os'] == "nos") {
+    $oids = snmp_walk($device, '1.3.6.1.4.1.1588.2.1.1.1.1.22.1.2', '-Osqn');
+    $oids = trim($oids);
+    foreach (explode("\n", $oids) as $data)
+    {
+        $data = trim($data);
+        if ($data AND $data[37] == "1")
+        {
+            $value_oid = ".1.3.6.1.4.1.1588.2.1.1.1.1.22.1.4.".$data[35];
+            $descr_oid = ".1.3.6.1.4.1.1588.2.1.1.1.1.22.1.5.".$data[35];
+            $value = snmp_get($device, $value_oid, '-Oqv');
+            $descr = snmp_get($device, $descr_oid, '-Oqv');
+            if (!strstr($descr, 'No') AND !strstr($value, 'No'))
+            {
+                $descr = str_replace('"', '', $descr);
+                $descr = trim($descr);
+                discover_sensor($valid['sensor'], 'temperature', $device, $value_oid, $data[35], 'nos', $descr, '1', '1', null, null, '80', '100');
+            }
+        }
+    }
+}