diff --git a/html/images/os/enterasys.png b/html/images/os/enterasys.png
new file mode 100644
index 0000000000..3732b8ef6d
Binary files /dev/null and b/html/images/os/enterasys.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 8fccf9d627..be7438e400 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1182,6 +1182,14 @@ $config['os'][$os]['over'][0]['graph']  = "device_bits";
 $config['os'][$os]['over'][0]['text']   = "Device Traffic";
 $config['os'][$os]['icon']              = "pbn";
 
+// Enterasys 
+$os = "enterasys";
+$config['os'][$os]['text']              = "Enterasys";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+$config['os'][$os]['icon']              = "enterasys";
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/enterasys.inc.php b/includes/discovery/os/enterasys.inc.php
new file mode 100644
index 0000000000..921783a3e1
--- /dev/null
+++ b/includes/discovery/os/enterasys.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+    if (preg_match("/^Enterasys Networks/", $sysDescr)) {
+	$os = "enterasys";
+    }
+}
+
+?>
diff --git a/includes/polling/os/enterasys.inc.php b/includes/polling/os/enterasys.inc.php
new file mode 100644
index 0000000000..9753e40b9c
--- /dev/null
+++ b/includes/polling/os/enterasys.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+# Enterasys Networks, Inc. G3G124-24P Rev 06.03.08.0012
+
+list(,,,$hardware,,$version) = explode(" ", $device['sysDescr']);
+
+
+?>