diff --git a/html/images/os/huawei.png b/html/images/os/huawei.png
new file mode 100644
index 000000000..a69dd8eae
Binary files /dev/null and b/html/images/os/huawei.png differ
diff --git a/includes/discovery/os/ios.inc.php b/includes/discovery/os/ios.inc.php
index 9db9bd29c..70c969bf6 100755
--- a/includes/discovery/os/ios.inc.php
+++ b/includes/discovery/os/ios.inc.php
@@ -3,8 +3,9 @@
 if(!$os) {
 
   if(strstr($sysDescr, "Cisco Internetwork Operating System Software")) { $os = "ios"; }
-  if(strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
-  if(strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
+  else if(strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
+  else if(strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
+  
   if(strstr($sysDescr, "IOS-XE")) { $os = "iosxe"; }
   if(strstr($sysDescr, "IOS XR")) { $os = "iosxr"; }
 
diff --git a/includes/discovery/os/speedtouch.inc.php b/includes/discovery/os/speedtouch.inc.php
index 443a17dd7..8983d73da 100755
--- a/includes/discovery/os/speedtouch.inc.php
+++ b/includes/discovery/os/speedtouch.inc.php
@@ -3,7 +3,7 @@
 if(!$os) {
 
   if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
-  else if(strpos($sysDescr, "SpeedTouch 5") !== FALSE) { $os = "speedtouch"; }
+  else if(strpos($sysDescr, "SpeedTouch ") !== FALSE) { $os = "speedtouch"; }
   else if (preg_match("/^ST\d/", $sysDescr)) { $os = "speedtouch"; }
 
 }
diff --git a/includes/discovery/os/vrp.inc.php b/includes/discovery/os/vrp.inc.php
new file mode 100644
index 000000000..fee80b4de
--- /dev/null
+++ b/includes/discovery/os/vrp.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+if(!$os) {
+
+  if(strstr($sysDescr, "VRP (R) Software")) { $os = "vrp"; }
+  else if(strstr($sysDescr, "VRP Software Version")) { $os = "vrp"; }
+
+}
+
+?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 96c9e866c..905fd08ab 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -86,6 +86,11 @@ $config['os']['catos']['text']		= "Cisco CatOS";
 $config['os']['catos']['ifname']	= 1;
 $config['os']['catos']['type']		= "network";
 
+$config['os']['vrp']['group'] 		= "vrp";
+$config['os']['vrp']['text']  		= "Huawei VRP";
+$config['os']['vrp']['type']  		= "network";
+$config['os']['vrp']['icon']  		= "huawei";
+
 $config['os']['junos']['text']		= "Juniper JunOS";
 $config['os']['junos']['type']		= "network";