diff --git a/html/images/os/mimosa.png b/html/images/os/mimosa.png
new file mode 100644
index 0000000000..ea4ebd40b4
Binary files /dev/null and b/html/images/os/mimosa.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 2a7827e13d..3da8f040cd 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -2160,6 +2160,18 @@ $config['os'][$os]['over'][1]['text']  = 'CPU Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
 
+// Mimosa 
+$os = 'mimosa';
+$config['os'][$os]['text']             = 'Mimosa';
+$config['os'][$os]['type']             = 'wireless';
+$config['os'][$os]['icon']             = 'mimosa';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
+$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
+$config['os'][$os]['over'][2]['text']  = 'Memory Usage';
+
 // Graph Types
 require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';
 
diff --git a/includes/discovery/os/mimosa.inc.php b/includes/discovery/os/mimosa.inc.php
new file mode 100644
index 0000000000..ec432e9e83
--- /dev/null
+++ b/includes/discovery/os/mimosa.inc.php
@@ -0,0 +1,15 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * 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.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (str_contains($sysDescr, 'Mimosa')) {
+    $os = 'mimosa';
+}
diff --git a/includes/polling/os/mimosa.inc.php b/includes/polling/os/mimosa.inc.php
new file mode 100644
index 0000000000..b06323fdae
--- /dev/null
+++ b/includes/polling/os/mimosa.inc.php
@@ -0,0 +1,15 @@
+<?php
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2016 Søren Friis Rosiak <sorenrosiak@gmail.com> 
+ * 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.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+$explodeddata = explode(" ", $poll_device['sysDescr']);
+$hardware = $explodeddata['1'];
+$version = $explodeddata['3'];
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index bba756c1ce..7187d088e7 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -821,6 +821,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('microsemitime');
     }
 
+    public function testMimosa()
+    {
+        $this->checkOS('mimosa');
+    }
+
     public function testMinkelsrms()
     {
         $this->checkOS('minkelsrms');
diff --git a/tests/snmpsim/mimosa.snmprec b/tests/snmpsim/mimosa.snmprec
new file mode 100644
index 0000000000..f283d8db7b
--- /dev/null
+++ b/tests/snmpsim/mimosa.snmprec
@@ -0,0 +1 @@
+1.3.6.1.2.1.1.1.0|4|Mimosa B5c Firmware v92329ce