diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index bb202a28ea..da11b60130 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -982,6 +982,12 @@ $config['os'][$os]['text']              = "Hikvision";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "hikvision";
 
+$os = "hp";
+$config['os'][$os]['text']              = "HP";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Traffic";
+$config['os'][$os]['type']              = "network";
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/hp.inc.php b/includes/discovery/os/hp.inc.php
new file mode 100644
index 0000000000..22fbb1b7b8
--- /dev/null
+++ b/includes/discovery/os/hp.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!$os)
+{
+  if(preg_match('/HP [a-zA-Z0-9-]+ Switch Software Version/',$string)) { $os = "hp"; }
+}
+
+?>
diff --git a/includes/polling/os/hp.inc.php b/includes/polling/os/hp.inc.php
new file mode 100644
index 0000000000..5525448862
--- /dev/null
+++ b/includes/polling/os/hp.inc.php
@@ -0,0 +1,6 @@
+<?php
+
+# Version is the last word in the sysDescr's first line
+list($version) = explode("\r", substr($poll_device['sysDescr'], strpos($poll_device['sysDescr'], "Release")+8));
+ 
+?>