diff --git a/includes/definitions/juniper-mss.yaml b/includes/definitions/juniper-mss.yaml
new file mode 100644
index 0000000000..8adfbd9f85
--- /dev/null
+++ b/includes/definitions/juniper-mss.yaml
@@ -0,0 +1,9 @@
+os: juniper-mss
+text: 'Juniper MSS'
+type: appliance
+icon: junos
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.14525.3.
diff --git a/includes/polling/os/juniper-mss.inc.php b/includes/polling/os/juniper-mss.inc.php
new file mode 100644
index 0000000000..24ef404069
--- /dev/null
+++ b/includes/polling/os/juniper-mss.inc.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * juniper-mss.inc.php
+ *
+ * LibreNMS os poller module for Juniper MSS
+ *
+ * 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  2017 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+$tmp_sysdescr = str_replace('Juniper Networks, Inc ', '', $poll_device['sysDescr']);
+
+list($hardware, $version,) = explode(' ', $tmp_sysdescr);
+
+unset($tmp_sysdescr);
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 805e78a587..df073d36c7 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -963,6 +963,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('juniperex2500os');
     }
 
+    public function testJuniperMss()
+    {
+        $this->checkOS('juniper-mss');
+    }
+
     public function testJunose()
     {
         $this->checkOS('junose');
diff --git a/tests/snmpsim/juniper-mss.snmprec b/tests/snmpsim/juniper-mss.snmprec
new file mode 100644
index 0000000000..37aeade463
--- /dev/null
+++ b/tests/snmpsim/juniper-mss.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Juniper Networks, Inc WLC880R 7.7.4.4 REL
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14525.3.3.1