diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index c86d4006f..476b0a027 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -434,6 +434,15 @@ $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "supermicro";
 $config['os'][$os]['ifname']            = 1;
 
+// Netgear ProSafe switches
+$os = "netgear";
+$config['os'][$os]['text']              = "Netgear ProSafe";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['ifname']            = 1;
+$config['os'][$os]['bad_if'][]          = "cpu";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+
 # Juniper
 
 $os = "junos";
diff --git a/includes/discovery/os/netgear.inc.php b/includes/discovery/os/netgear.inc.php
new file mode 100644
index 000000000..ba876fdfc
--- /dev/null
+++ b/includes/discovery/os/netgear.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+if (!$os) {
+    if (stristr($sysDescr, "ProSafe")) { $os = "netgear"; }
+}
diff --git a/includes/polling/os/netgear.inc.php b/includes/polling/os/netgear.inc.php
new file mode 100644
index 000000000..7b6787650
--- /dev/null
+++ b/includes/polling/os/netgear.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+// sysDescr.0 = XS712T ProSafe 12-Port 10 Gigabit Ethernet (10GbE) Smart Switch, 6.1.0.12, B6.1.0.1
+
+list($hardware, ) = explode(" ", $poll_device['sysDescr']);
+list(,$version, ) = explode(",", $poll_device['sysDescr']);
+