diff --git a/html/images/os/mellanox.png b/html/images/os/mellanox.png
new file mode 100644
index 0000000000..a1b9b4b0eb
Binary files /dev/null and b/html/images/os/mellanox.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 52d24bbc1e..06bde76797 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -656,6 +656,16 @@ $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 #$config['os'][$os]['over'][2]['graph']  = "device_mempool";
 #$config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
+$os = "mellanox";
+$config['os'][$os]['text']               = "Mellanox";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
+$config['os'][$os]['over'][1]['text']   = "CPU Usage";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
 $os = "powervault";
 $config['os'][$os]['text']              = "Dell PowerVault";
 $config['os'][$os]['icon']              = "dell";
diff --git a/includes/discovery/os/mellanox.inc.php b/includes/discovery/os/mellanox.inc.php
new file mode 100644
index 0000000000..7400f910be
--- /dev/null
+++ b/includes/discovery/os/mellanox.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+if (!$os) {
+    if (stristr($sysDescr, "mellanox")) {
+        $os = "mellanox";
+    }
+}
diff --git a/includes/polling/os/mellanox.inc.php b/includes/polling/os/mellanox.inc.php
new file mode 100644
index 0000000000..69744f9743
--- /dev/null
+++ b/includes/polling/os/mellanox.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (stristr($poll_device['sysDescr'], "Linux")) {
+    list(,,$version,$hardware) = explode(' ', $poll_device['sysDescr']);
+} else {
+    list($hardware,,$version) = explode(',',$poll_device['sysDescr']);
+    $hardware = preg_replace("/Mellanox /","", $hardware);
+}