diff --git a/html/images/os/hikvision.png b/html/images/os/hikvision.png
new file mode 100644
index 000000000..ffd68e961
Binary files /dev/null and b/html/images/os/hikvision.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 50921ed57..5288d526b 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -938,6 +938,11 @@ $config['os'][$os]['group']             = "unix";
 $config['os'][$os]['type']              = "storage";
 $config['os'][$os]['icon']              = "synology";
 
+$os = "hikvision";
+$config['os'][$os]['text']              = "Hikvision";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "hikvision";
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/hikvision.inc.php b/includes/discovery/os/hikvision.inc.php
new file mode 100644
index 000000000..d5486cdf7
--- /dev/null
+++ b/includes/discovery/os/hikvision.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os)
+{
+    if (preg_match("/Hikvision/", snmp_get($device, ".1.3.6.1.4.1.39165.1.6.0", "-Oqv", ""))) {
+      $os = "hikvision";
+    }
+}
+
diff --git a/includes/functions.php b/includes/functions.php
index 8dba210de..90a807cbf 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -451,6 +451,10 @@ function isSNMPable($device)
   global $config;
 
   $pos = snmp_get($device, "sysObjectID.0", "-Oqv", "SNMPv2-MIB");
+  if(empty($pos)) {
+     // Support for Hikvision
+     $pos = snmp_get($device, "SNMPv2-SMI::enterprises.39165.1.1.0", "-Oqv", "SNMPv2-MIB");
+  }
   if ($pos === '' || $pos === false)
   {
     return false;
diff --git a/includes/polling/os/hikvision.inc.php b/includes/polling/os/hikvision.inc.php
new file mode 100644
index 000000000..d7cdde5eb
--- /dev/null
+++ b/includes/polling/os/hikvision.inc.php
@@ -0,0 +1,4 @@
+<?php
+
+$version = trim(snmp_get($device, ".1.3.6.1.4.1.39165.1.3.0", "-OQv", "", ""),'"');
+$hardware = trim(snmp_get($device, ".1.3.6.1.4.1.39165.1.1.0", "-OQv", "", ""),'"');