diff --git a/AUTHORS.md b/AUTHORS.md
index 16c61876c2..8a3d362bb9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -196,7 +196,6 @@ LibreNMS contributors:
 - Deeps (deepseth)
 - Jari Schäfer <jari.schaefer@gmail.com> (jarischaefer)
 - Jan-Philipp Litza <janphilipp@litza.de> (jplitza)
-- Lorenzo Zafra <zafra@ualberta.ca> (enzozafra)
 
 Observium was written by:
 - Adam Armstrong
diff --git a/includes/definitions/timos.yaml b/includes/definitions/timos.yaml
index 9dc195ee62..3658232e64 100644
--- a/includes/definitions/timos.yaml
+++ b/includes/definitions/timos.yaml
@@ -14,6 +14,7 @@ discovery:
         - .1.3.6.1.4.1.6527.6.2.1.2.6.
         - .1.3.6.1.4.1.6527.6.2.1.2.5.
         - .1.3.6.1.4.1.6527.6.2.1.2.8.
+        - .1.3.6.1.4.1.6527.6.2.1.2.9.
         - .1.3.6.1.4.1.6527.1.6.1
         - .1.3.6.1.4.1.6527.1.6.5
         - .1.3.6.1.4.1.6527.6.1.1.2.
diff --git a/includes/polling/os/timos.inc.php b/includes/polling/os/timos.inc.php
new file mode 100644
index 0000000000..602ee59f5a
--- /dev/null
+++ b/includes/polling/os/timos.inc.php
@@ -0,0 +1,22 @@
+<?php
+
+//SNMPv2-SMI::enterprises.6527.3.1.2.1.1.5.0 = Gauge32: 9 - sgiSwMajorVersion
+//SNMPv2-SMI::enterprises.6527.3.1.2.1.1.6.0 = Gauge32: 0 - sgiSwMinorVersion
+//SNMPv2-SMI::enterprises.6527.3.1.2.1.1.7.0 = STRING: "R3" - sgiSwVersionModifier
+
+$majorVersion = trim(snmp_get($device, '1.3.6.1.4.1.6527.3.1.2.1.1.5.0', '-OQv', '', ''), '" ');
+$minorVersion = trim(snmp_get($device, '1.3.6.1.4.1.6527.3.1.2.1.1.6.0', '-OQv', '', ''), '" ');
+$versionModifier = trim(snmp_get($device, '1.3.6.1.4.1.6527.3.1.2.1.1.7.0', '-OQv', '', ''), '" ');
+
+$version = 'v' . $majorVersion . '.' . $minorVersion . '.' . $versionModifier;
+
+//SNMPv2-MIB::sysDescr.0 = STRING: TiMOS-B-9.0.R3 both/hops Nokia SAS-Sx 48Tp4SFP+ (PoE) 7210 Copyright (c) 2000-2017 Nokia.
+//All rights reserved. All use subject to applicable license agreements.
+//Built on Thu Jan 5 11:01:16 IST 2017 by builder in /home/builder/9.0B1/R3/panos/main
+
+$pattern = "~(cpm|both)\/(hops64|hops|x86_64) (?'hardware'.*)\sCopyright~";
+preg_match($pattern, $poll_device['sysDescr'], $matches);
+
+if ($matches['hardware']) {
+    $hardware = $matches['hardware'];
+}
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 8328b68df4..34fc107345 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -1653,6 +1653,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('timos', 'timos7');
         $this->checkOS('timos', 'timos8');
         $this->checkOS('timos', 'timos9');
+        $this->checkOS('timos', 'timos10');
     }
 
     public function testTomato()
diff --git a/tests/snmpsim/timos10.snmprec b/tests/snmpsim/timos10.snmprec
new file mode 100644
index 0000000000..25e9e65673
--- /dev/null
+++ b/tests/snmpsim/timos10.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|TiMOS-B-9.0.R3 both/hops Nokia SAS-Sx 48Tp4SFP+ (PoE) 7210 Copyright (c) 2000-2017 Nokia. All rights reserved. All use subject to applicable license agreements. Built on Thu Jan 5 11:01:16 IST 2017 by builder in /home/builder/9.0B1/R3/panos/main
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6527.6.2.1.2.9.5