diff --git a/html/images/os/supermicro.png b/html/images/os/supermicro.png
new file mode 100644
index 000000000..c07bc2f71
Binary files /dev/null and b/html/images/os/supermicro.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index c4475365a..5919cfbdb 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -310,6 +310,15 @@ $config['os'][$os]['text']              = "ZTE ZXR10";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "zte";
 
+## Supermicro Switch
+
+$os = "supermicro-switch";
+$config['os'][$os]['group']             = "supermicro";
+$config['os'][$os]['text']              = "Supermicro Switch";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "supermicro";
+$config['os'][$os]['ifname']            = 1;
+
 # Juniper
 
 $os = "junos";
diff --git a/includes/discovery/os/supermicro-switch.inc.php b/includes/discovery/os/supermicro-switch.inc.php
new file mode 100644
index 000000000..f70783f52
--- /dev/null
+++ b/includes/discovery/os/supermicro-switch.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+if (!$os)
+{
+    if (preg_match("/^Supermicro Switch/", $sysDescr)) { $os = "supermicro-switch"; }
+    else if (preg_match("/^SSE-/", $sysDescr)) { $os = "supermicro-switch"; }
+    else if (preg_match("/^SBM-/", $sysDescr)) { $os = "supermicro-switch"; }
+}
+
+?>