diff --git a/html/images/os/axiscam.png b/html/images/os/axiscam.png
new file mode 100644
index 000000000..dba70a171
Binary files /dev/null and b/html/images/os/axiscam.png differ
diff --git a/html/images/os/drac.png b/html/images/os/drac.png
new file mode 100644
index 000000000..9fffd8c50
Binary files /dev/null and b/html/images/os/drac.png differ
diff --git a/html/images/os/mgepdu.png b/html/images/os/mgepdu.png
new file mode 100644
index 000000000..670303fb0
Binary files /dev/null and b/html/images/os/mgepdu.png differ
diff --git a/includes/functions.php b/includes/functions.php
index aaba84555..18d90d720 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -105,7 +105,7 @@ function getHostOS($device)
   $dir_handle = @opendir($config['install_dir'] . "/includes/osdiscovery") or die("Unable to open $path");
   while ($file = readdir($dir_handle))
   {
-    if ( preg_match("/^discover-([a-z0-9\-]*).php/", $file) )
+    if ( preg_match("/^discover-([a-z0-9\-]*).php$/", $file) )
     {
       include($config['install_dir'] . "/includes/osdiscovery/" . $file);
     }
diff --git a/includes/osdiscovery/discover-apc.php b/includes/osdiscovery/discover-apc.php
index f59e213bc..aee6b3eb1 100644
--- a/includes/osdiscovery/discover-apc.php
+++ b/includes/osdiscovery/discover-apc.php
@@ -4,6 +4,7 @@ if(!$os) {
 
   if(strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
   else if(strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
+  else if(strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
 
 }
 
diff --git a/includes/osdiscovery/discover-axiscam.php b/includes/osdiscovery/discover-axiscam.php
new file mode 100644
index 000000000..b366fb9e9
--- /dev/null
+++ b/includes/osdiscovery/discover-axiscam.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+
+  if (preg_match("/AXIS.*Network Camera/", $sysDescr)) { $os = "axiscam"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-drac.php b/includes/osdiscovery/discover-drac.php
new file mode 100644
index 000000000..82e24cf0f
--- /dev/null
+++ b/includes/osdiscovery/discover-drac.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "Dell Out-of-band SNMP Agent for Remote Access Controller")) { $os = "drac"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-jetdirect.php b/includes/osdiscovery/discover-jetdirect.php
index bd3470697..26b167552 100644
--- a/includes/osdiscovery/discover-jetdirect.php
+++ b/includes/osdiscovery/discover-jetdirect.php
@@ -3,7 +3,8 @@
 if(!$os) {
 
   if(strstr($sysDescr, "JETDIRECT")) { $os = "jetdirect"; }
-  else if(strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT,")) { $os = "jetdirect"; }
+  else if(strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT")) { $os = "jetdirect"; }
+
 }
 
 ?>
diff --git a/includes/osdiscovery/discover-mgepdu.php b/includes/osdiscovery/discover-mgepdu.php
new file mode 100644
index 000000000..3a464e577
--- /dev/null
+++ b/includes/osdiscovery/discover-mgepdu.php
@@ -0,0 +1,9 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "MGE Switched PDU")) { $os = "mgepdu"; }
+
+}
+
+?>
diff --git a/includes/osdiscovery/discover-speedtouch.php b/includes/osdiscovery/discover-speedtouch.php
index a1060aa71..c87250de0 100755
--- a/includes/osdiscovery/discover-speedtouch.php
+++ b/includes/osdiscovery/discover-speedtouch.php
@@ -3,6 +3,7 @@
 if(!$os) {
 
   if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
+  else if(strpos($sysDescr, "SpeedTouch 5") !== FALSE) { $os = "speedtouch"; }
 
 }
 
diff --git a/includes/static-config.php b/includes/static-config.php
index 72d4e5bcc..f2faba7f8 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -101,9 +101,14 @@ $config['os']['powerconnect']['text']   = "Dell PowerConnect";
 $config['os']['powerconnect']['ifname'] = 1;
 $config['os']['powerconnect']['type']   = "network";
 
-$config['os']['powervault']['text']   = "Dell PowerVault";
+$config['os']['powervault']['text']     = "Dell PowerVault";
 
-$config['os']['gamatronicups']['text']   = "Gamatronic UPS Stack";
+$config['os']['drac']['text']           = "Dell DRAC";
+
+$config['os']['axiscam']['text']        = "AXIS Network Camera";
+
+$config['os']['gamatronicups']['text']  = "Gamatronic UPS Stack";
+$config['os']['gamatronicups']['type']  = "power";
 
 $config['os']['airport']['type'] 	= "network";
 $config['os']['airport']['text']  	= "Apple AirPort";
@@ -132,6 +137,9 @@ $config['os']['mgeups']['overgraph'][]	= "device_current";
 $config['os']['mgeups']['overtext']	= "Current";
 $config['os']['mgeups']['type']		= "power";
 
+$config['os']['mgepdu']['text']         = "MGE PDU";
+$config['os']['mgepdu']['type']		= "power";
+
 $config['os']['apc']['text']            = "APC Management Module";
 $config['os']['apc']['overgraph'][]	= "device_current";
 $config['os']['apc']['overtext']	= "Current";