diff --git a/html/images/os/kti.svg b/html/images/os/kti.svg
new file mode 100644
index 0000000000..0e23735ad6
--- /dev/null
+++ b/html/images/os/kti.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="68.444" width="124.232" viewBox="0 0 116.46713 64.166374"><g fill="#014ea0"><path d="M28.913 25.762c.06.466.148 1.13.148 1.13h16.102l-.872-6.578C44.404 20.167 59.604 0 59.604 0H43.393S33.685 12.877 32.328 14.68L36.853 0H20.73l-8.288 26.893H28.56s.198-.644.352-1.131M45.202 28.708H29.3l.51 3.837h16.102l-.51-3.837h-.2zM46.66 38.197l-.508-3.837H30.048l.507 3.837H46.66zM47.443 44.102l-.543-4.091H30.8l.537 4.091h16.106zM24.518 40.01H8.4l-1.258 4.092h16.115l1.262-4.091zM26.264 34.36h-16.12l-1.185 3.837h16.12l1.185-3.837zM28.004 28.708h-16.12l-1.182 3.837h16.116l1.186-3.837zM107.878 26.893L116.168 0h-16.12L91.76 26.893h16.117zM107.318 28.708H91.2l-1.184 3.837h16.121l1.181-3.837zM86.454 44.102h16.12l1.263-4.091h-16.12l-1.263 4.091zM105.575 34.36H89.46l-1.181 3.837h16.116l1.181-3.837zM67.343 12.344l-4.485 14.549h16.116l4.488-14.549h10.825L98.019.04H60.468l-3.733 12.305h10.608M57.553 44.102h16.119l1.26-4.091h-16.12l-1.26 4.091zM76.674 34.36H60.558l-1.184 3.837H75.49l1.184-3.837zM78.415 28.708h-16.12l-1.18 3.837h16.12l1.18-3.837zM15.495 52.003v7.305l-4.048-7.305H8.336v11.848h2.896v-7.452c.695 1.244 4.18 7.452 4.18 7.452h2.978V52.003h-2.895M24.04 58.871h6.088v-2.43H24.04v-1.966h6.638v-2.472h-9.651V63.85h9.956v-2.501H24.04V58.87zM31.52 52.003v2.473h3.768v9.375h3.09v-9.375h3.75v-2.473H31.52zM69.665 53.036c.002.002.002.004.002.007.005 0 .005 0 .008.002l-.01-.009"/><path d="M65.412 51.655c-1.84 0-3.277.468-4.26 1.39-1.31 1.078-1.978 2.719-1.978 4.866 0 2.107.666 3.747 1.985 4.872.976.917 2.409 1.383 4.253 1.383 1.846 0 3.278-.466 4.262-1.39 1.304-1.118 1.97-2.758 1.97-4.865 0-2.146-.669-3.782-1.977-4.868-.984-.92-2.414-1.388-4.255-1.388m-2.313 3.438c.579-.65 1.336-.965 2.313-.965.978 0 1.73.317 2.3.968.568.655.856 1.602.856 2.815 0 1.218-.288 2.17-.856 2.82-.567.65-1.322.967-2.3.967-.977 0-1.734-.317-2.313-.968-.576-.651-.869-1.601-.869-2.819s.293-2.166.87-2.818M83.405 62.638l-.064-1.008v-.765c0-.848-.126-1.471-.395-1.901-.197-.321-.601-.531-.999-.741.549-.243.997-.57 1.263-1.038.32-.552.482-1.127.482-1.71l-.258-1.288-.685-1.023a3.455 3.455 0 0 0-1.29-.852c-.498-.19-1.205-.294-2.107-.31h-6.38V63.85h3.015v-4.467h2.477c.888 0 1.267.167 1.43.309.225.195.347.638.36 1.283l.013 1.062.118 1.026.222.795.17-.008h3.112v-.585l-.12-.123-.364-.504zm-7.418-8.203h2.815l1.18.18c.423.199.628.585.628 1.187 0 .55-.205.89-.64 1.073l-1.24.169h-2.743v-2.609M97.416 52.003h-3.97c-.131.053-3.496 3.303-4.614 4.384v-4.384h-3.03v11.848h3.03v-3.94c.11-.1.747-.7.997-.93.28.362 3.786 4.87 3.786 4.87h3.95S92.257 57.26 92 56.946l5.415-4.943M107.25 57.783c-.515-.368-1.247-.651-2.229-.865l-2.163-.473-1.574-.45c-.325-.166-.471-.39-.471-.712 0-.361.158-.636.492-.841.364-.227.866-.339 1.496-.339.572 0 1.053.089 1.427.264.535.255.82.671.857 1.271l.014.211h2.966l-.011-.234c-.048-1.28-.574-2.273-1.563-2.95-.967-.66-2.148-.995-3.511-.995-1.629 0-2.886.36-3.737 1.065-.873.717-1.312 1.632-1.312 2.718 0 1.199.464 2.092 1.377 2.659.52.33 1.43.626 2.776.903l1.329.272 1.64.508c.296.165.43.38.43.675 0 .545-.298.9-.94 1.108l-1.435.174c-.96 0-1.64-.213-2.015-.63-.203-.222-.34-.577-.415-1.049l-.03-.193h-2.917v.228c0 1.254.503 2.257 1.494 2.977.971.703 2.313 1.06 3.988 1.06 1.642 0 2.936-.365 3.85-1.08.927-.73 1.4-1.665 1.4-2.772 0-1.088-.41-1.931-1.213-2.51M55.13 52.003l-1.257 6.423c-.392-1.394-1.816-6.423-1.816-6.423h-2.725s-1.422 5.03-1.819 6.423l-1.252-6.423h-3.139l2.905 11.848h2.7l1.97-7.908c.351 1.425 1.965 7.908 1.965 7.908h2.701l2.903-11.848H55.13M6.788 50.867h102.027v-5.185H6.788v5.185z"/></g></svg>
\ No newline at end of file
diff --git a/includes/definitions/kti.yaml b/includes/definitions/kti.yaml
new file mode 100644
index 0000000000..1a08489cbb
--- /dev/null
+++ b/includes/definitions/kti.yaml
@@ -0,0 +1,10 @@
+os: kti
+text: KTI
+type: network
+icon: kti
+ifname: 1
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+discovery:
+    - sysDescr_regex:
+        - '/^KGS-/'
diff --git a/includes/discovery/os/kti.inc.php b/includes/discovery/os/kti.inc.php
new file mode 100644
index 0000000000..d606a1f0ca
--- /dev/null
+++ b/includes/discovery/os/kti.inc.php
@@ -0,0 +1,7 @@
+<?php
+
+echo "KGS SWITCH $sysDescr\n";
+
+if (starts_with($sysDescr, 'KGS-')) {
+    $os = 'kti';
+}
diff --git a/includes/polling/os/kti.inc.php b/includes/polling/os/kti.inc.php
new file mode 100644
index 0000000000..11deb2aad2
--- /dev/null
+++ b/includes/polling/os/kti.inc.php
@@ -0,0 +1,4 @@
+<?php
+
+$hardware     = trim($poll_device['sysDescr'], '"');
+$version      = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.9.1", '-Ovq'), '"');
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index f50e03e072..77a8c910db 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -819,6 +819,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('jwos');
     }
 
+    public function testKti()
+    {
+        $this->checkOS('kti');
+    }
+
     public function testKonica()
     {
         $this->checkOS('konica');
diff --git a/tests/snmpsim/kti.snmprec b/tests/snmpsim/kti.snmprec
new file mode 100644
index 0000000000..da059bd9b0
--- /dev/null
+++ b/tests/snmpsim/kti.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|KGS-1060 GigaBit Ethernet Switch