diff --git a/html/images/os/tplink.png b/html/images/os/tplink.png
index 4cfd6eae32..4afc4dfee4 100644
Binary files a/html/images/os/tplink.png and b/html/images/os/tplink.png differ
diff --git a/includes/definitions/jetstream.yaml b/includes/definitions/jetstream.yaml
new file mode 100644
index 0000000000..1f5c15d1a0
--- /dev/null
+++ b/includes/definitions/jetstream.yaml
@@ -0,0 +1,4 @@
+os: jetstream
+text: 'TP-Link JetStream'
+type: network
+icon: tplink
diff --git a/includes/discovery/os/jetstream.inc.php b/includes/discovery/os/jetstream.inc.php
new file mode 100644
index 0000000000..61b7f1948f
--- /dev/null
+++ b/includes/discovery/os/jetstream.inc.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * jetstream.inc.php
+ *
+ * LibreNMS os discovery module for JetStream
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+$jetstream = array(
+    '.1.3.6.1.4.1.11863.5.34'
+);
+
+if (starts_with($sysObjectId, $jetstream)) {
+    $os = 'jetstream';
+}
+
+unset($jetstream);
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index fd4bb6f41a..a6d58603a0 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -761,6 +761,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('jetdirect', 'jetdirect2');
     }
 
+    public function testJetstream()
+    {
+        $this->checkOS('jetstream');
+    }
+
     public function testJuniperex2500os()
     {
         $this->checkOS('juniperex2500os');
diff --git a/tests/snmpsim/jetstream.snmprec b/tests/snmpsim/jetstream.snmprec
new file mode 100644
index 0000000000..ac9d065ae8
--- /dev/null
+++ b/tests/snmpsim/jetstream.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|JetStream 48-Port Gigabit L2 Managed Switch with 4 SFP Slots
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11863.5.34