diff --git a/AUTHORS.md b/AUTHORS.md
index 21208d5529..18d9a72d92 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -156,6 +156,8 @@ LibreNMS contributors:
 - Christoph Zilian <czilian@hotmail.com> (czilian)
 - Guillem Mateos <bbguillem@gmail.com> (guillemmateos) 
 - Joachim Tingvold <joachim@tingvold.com> (jallakim)
+- Martin Zatloukal <slezi2@pvfree.net> (erotel)
+
 
 [1]: http://observium.org/ "Observium web site"
 Observium was written by:
diff --git a/includes/discovery/os/edgecos.inc.php b/includes/discovery/os/edgecos.inc.php
index 326fe8a1af..8b7fc8e9e6 100644
--- a/includes/discovery/os/edgecos.inc.php
+++ b/includes/discovery/os/edgecos.inc.php
@@ -26,6 +26,10 @@
 $items = array(
     '.1.3.6.1.4.1.259.6.10.94',
     '.1.3.6.1.4.1.259.10.1.45.103',
+    '.1.3.6.1.4.1.259.10.1.24.104',
+    '.1.3.6.1.4.1.259.10.1.24.103',
+    '.1.3.6.1.4.1.259.10.1.22.101',
+    '.1.3.6.1.4.1.259.10.1.42.101',
 );
 
 if (starts_with($sysObjectId, $items)) {
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 95fcc1f956..f7447d540f 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -473,6 +473,10 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     {
         $this->checkOS('edgecos', 'edgecos-es3528m');
         $this->checkOS('edgecos', 'edgecos-ecs4120-28f');
+        $this->checkOS('edgecos', 'edgecos-es3528mv2');
+        $this->checkOS('edgecos', 'edgecos-ecs4510-28f');
+        $this->checkOS('edgecos', 'edgecos-ecs4510-52t');
+        $this->checkOS('edgecos', 'edgecos-ecs4210-28t');
     }
 
     public function testEdgeos()
diff --git a/tests/snmpsim/edgecos-ecs4210-28t.snmprec b/tests/snmpsim/edgecos-ecs4210-28t.snmprec
new file mode 100644
index 0000000000..d66349de41
--- /dev/null
+++ b/tests/snmpsim/edgecos-ecs4210-28t.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ECS4210-28T
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.259.10.1.42.101
\ No newline at end of file
diff --git a/tests/snmpsim/edgecos-ecs4510-28f.snmprec b/tests/snmpsim/edgecos-ecs4510-28f.snmprec
new file mode 100644
index 0000000000..40a8ff9de5
--- /dev/null
+++ b/tests/snmpsim/edgecos-ecs4510-28f.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ECS4510-28F
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.259.10.1.24.103
diff --git a/tests/snmpsim/edgecos-ecs4510-52t.snmprec b/tests/snmpsim/edgecos-ecs4510-52t.snmprec
new file mode 100644
index 0000000000..8097a3a8ec
--- /dev/null
+++ b/tests/snmpsim/edgecos-ecs4510-52t.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ECS4510-52T
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.259.10.1.24.104
diff --git a/tests/snmpsim/edgecos-es3528mv2.snmprec b/tests/snmpsim/edgecos-es3528mv2.snmprec
new file mode 100644
index 0000000000..99d87f30b9
--- /dev/null
+++ b/tests/snmpsim/edgecos-es3528mv2.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|ES3528MV2
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.259.10.1.22.101