diff --git a/includes/discovery/processors/datacom.inc.php b/includes/discovery/processors/datacom.inc.php
new file mode 100644
index 000000000..90591c3d2
--- /dev/null
+++ b/includes/discovery/processors/datacom.inc.php
@@ -0,0 +1,11 @@
+<?php
+if ($device['os'] == "datacom") {
+   echo("Datacom Switch : ");
+   $descr = "Processor";
+   $usage = snmp_get($device, "swCpuUsage.0", "-Ovq", "DMswitch-MIB");
+   echo $usage."\n";
+   if (is_numeric($usage)) {
+      discover_processor($valid['processor'], $device, "swCpuUsage", "0", "datacom", $descr, "1", $usage, NULL, NULL);
+   }
+}
+?>
\ No newline at end of file
diff --git a/includes/polling/os/datacom.inc.php b/includes/polling/os/datacom.inc.php
index 2785f0b44..ffd78d6e6 100644
--- a/includes/polling/os/datacom.inc.php
+++ b/includes/polling/os/datacom.inc.php
@@ -1,6 +1,6 @@
 <?php
-if (!$os)
-{
-   if (strstr($sysObjectId, ".1.3.6.1.4.1.3709")) { $os = "datacom"; }
-}
+$hardware = "Datacom ".str_replace("dmSwitch","DM",snmp_get($device, "swChassisModel.0", "-Ovq", "DMswitch-MIB"));
+$version  = snmp_get($device, "swFirmwareVer.1", "-Ovq", "DMswitch-MIB");
+$features  = snmp_get($device, "sysDescr.0", "-Oqv", "SNMPv2-MIB");
+$serial = snmp_get($device, "DMswitch-MIB::swSerialNumber.1", "-Ovq","DMswitch-MIB");
 ?>
\ No newline at end of file
diff --git a/includes/polling/processors/datacom.inc.php b/includes/polling/processors/datacom.inc.php
new file mode 100644
index 000000000..600ab93ae
--- /dev/null
+++ b/includes/polling/processors/datacom.inc.php
@@ -0,0 +1,3 @@
+<?php
+   $proc = snmp_get($device, "swCpuUsage.0", "-Ovq", "DMswitch-MIB");
+?>
\ No newline at end of file