diff --git a/html/images/logos/etherwan.png b/html/images/logos/etherwan.png
new file mode 100644
index 0000000000..f4d061d808
Binary files /dev/null and b/html/images/logos/etherwan.png differ
diff --git a/html/images/os/etherwan.png b/html/images/os/etherwan.png
new file mode 100644
index 0000000000..ddfbe9dd37
Binary files /dev/null and b/html/images/os/etherwan.png differ
diff --git a/includes/definitions/etherwan.yaml b/includes/definitions/etherwan.yaml
new file mode 100644
index 0000000000..30c8b47822
--- /dev/null
+++ b/includes/definitions/etherwan.yaml
@@ -0,0 +1,10 @@
+os: etherwan
+text: 'Etherwan Managed Switch'
+type: network
+icon: etherwan
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'CPU Usage' }
+discovery:
+    - sysObjectId:
+        - .1.3.6.1.4.1.2736.
diff --git a/includes/polling/os/etherwan.inc.php b/includes/polling/os/etherwan.inc.php
new file mode 100644
index 0000000000..7d84a6c914
--- /dev/null
+++ b/includes/polling/os/etherwan.inc.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * etherwan.inc.php
+ *
+ * LibreNMS os poller module for Etherwan 6TX + 2G Managed Switch
+ *
+ * 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 Lorenzo Zafra
+ * @author     Lorenzo Zafra<zafra@ualberta.ca>
+ */
+
+preg_match('~(?\'hardware\'.*?),\sFirmware\srev:\s(?\'version\'.*) \d\d\/\d\d\/\d\d~', $poll_device['sysDescr'], $matches);
+
+if ($matches['hardware']) {
+    $hardware = $matches['hardware'];
+}
+
+if ($matches['version']) {
+    $version = $matches['version'];
+}
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 0c3c31e574..b811ebcf92 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -700,6 +700,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('ericsson-es');
     }
 
+    public function testEtherwan()
+    {
+        $this->checkOS('etherwan');
+    }
+
     public function testExinda()
     {
         $this->checkOS('exinda');
diff --git a/tests/snmpsim/etherwan.snmprec b/tests/snmpsim/etherwan.snmprec
new file mode 100644
index 0000000000..ed4a9dcce0
--- /dev/null
+++ b/tests/snmpsim/etherwan.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|Etherwan 6TX+2G Managed Switch, Firmware rev: 1.94.3 05/11/15 16:31:18
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2736.1.1