diff --git a/html/images/logos/exinda.png b/html/images/logos/exinda.png
new file mode 100644
index 0000000000..fe57e4de92
Binary files /dev/null and b/html/images/logos/exinda.png differ
diff --git a/html/images/os/exinda.png b/html/images/os/exinda.png
new file mode 100644
index 0000000000..781d148d49
Binary files /dev/null and b/html/images/os/exinda.png differ
diff --git a/includes/definitions/exinda.yaml b/includes/definitions/exinda.yaml
new file mode 100644
index 0000000000..bc40155f20
--- /dev/null
+++ b/includes/definitions/exinda.yaml
@@ -0,0 +1,11 @@
+os: exinda
+text: Exinda
+type: appliance
+icon: exinda
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'CPU Usage' }
+    - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.21091
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index b584a6452c..aec39892da 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -583,6 +583,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('ericsson-es');
     }
 
+    public function testExinda()
+    {
+        $this->checkOS('exinda');
+    }
+
     public function testExtremeware()
     {
         $this->checkOS('extremeware');
diff --git a/tests/snmpsim/exinda.snmprec b/tests/snmpsim/exinda.snmprec
new file mode 100644
index 0000000000..fbc895281b
--- /dev/null
+++ b/tests/snmpsim/exinda.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Linux JHB-Exinda 3.10.72-72EXINDAsmp #0 SMP @1435203969 x86_64
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.21091
\ No newline at end of file