diff --git a/html/images/os/d-link.png b/html/images/os/d-link.png
deleted file mode 100644
index 33ba5a00cf..0000000000
Binary files a/html/images/os/d-link.png and /dev/null differ
diff --git a/html/images/os/drac.png b/html/images/os/drac.png
deleted file mode 100644
index 9fffd8c50c..0000000000
Binary files a/html/images/os/drac.png and /dev/null differ
diff --git a/html/images/os/novell.png b/html/images/os/novell.png
new file mode 100644
index 0000000000..14c483042e
Binary files /dev/null and b/html/images/os/novell.png differ
diff --git a/includes/osdiscovery/discover-ies.php b/includes/osdiscovery/discover-ies.php
index a5e9b08f01..de24b56a4f 100644
--- a/includes/osdiscovery/discover-ies.php
+++ b/includes/osdiscovery/discover-ies.php
@@ -2,7 +2,7 @@
 
 if(!$os) {
 
-  if(strpos($sysDescr, "ZyXEL IES-") !== FALSE) { $os = "ies"; }
+  if(strpos($sysDescr, "IES-") !== FALSE) { $os = "ies"; }
 
 }
 
diff --git a/includes/osdiscovery/discover-netware.php b/includes/osdiscovery/discover-netware.php
new file mode 100644
index 0000000000..b7abfc1182
--- /dev/null
+++ b/includes/osdiscovery/discover-netware.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "Novell NetWare")) { $os = "netware"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-zyxeles.php b/includes/osdiscovery/discover-zyxeles.php
new file mode 100644
index 0000000000..24d99a3b41
--- /dev/null
+++ b/includes/osdiscovery/discover-zyxeles.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/^ES-/", $sysDescr)) { $os = "zyxeles"; }
+
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 5019c54277..91cdffd124 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -27,6 +27,9 @@ $config['os']['netbsd']['text']  	= "NetBSD";
 $config['os']['dragonfly']['group'] 	= "unix";
 $config['os']['dragonfly']['text']  	= "DragonflyBSD";
 
+$config['os']['netware']['text']  	= "Novell Netware";
+$config['os']['netware']['icon']  	= "novell";
+
 $config['os']['monowall']['group'] 	= "unix";
 $config['os']['monowall']['text']  	= "m0n0wall";
 $config['os']['monowall']['type']  	= "firewall";
@@ -120,7 +123,7 @@ $config['os']['dlink']['icon']          = "dlink";
 
 $config['os']['dlinkap']['text']        = "D-Link Access Point";
 $config['os']['dlinkap']['type']        = "network";
-$config['os']['dlink']['icon']          = "dlink";
+$config['os']['dlinkap']['icon']        = "dlink";
 
 $config['os']['axiscam']['text']        = "AXIS Network Camera";
 
@@ -157,6 +160,10 @@ $config['os']['prestige']['text']     	= "ZyXEL Prestige";
 $config['os']['prestige']['type']     	= "network";
 $config['os']['prestige']['icon']       = "zyxel";
 
+$config['os']['zyxeles']['text']     	= "ZyXEL Ethernet Switch";
+$config['os']['zyxeles']['type']     	= "network";
+$config['os']['zyxeles']['icon']        = "zyxel";
+
 $config['os']['ies']['text']     	= "ZyXEL IES DSLAM";
 $config['os']['ies']['type']     	= "network";
 $config['os']['ies']['icon']            = "zyxel";