diff --git a/html/images/os/edgeos.png b/html/images/os/edgeos.png
new file mode 100644
index 000000000..ae3f499e6
Binary files /dev/null and b/html/images/os/edgeos.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 7fb406f04..50921ed57 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -46,6 +46,17 @@ $config['os'][$os]['over'][1]['text']   = "Processor Usage";
 $config['os'][$os]['over'][2]['graph']  = "device_ucd_memory";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
+$os = "edgeos";
+$config['os'][$os]['text']              = "EdgeOS";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['ifname']            = 1;
+$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']   = "Processor Usage";
+$config['os'][$os]['over'][2]['graph']  = "device_ucd_memory";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
 // Linux-based OSes here please.
 
 $os = "linux";
diff --git a/includes/discovery/os/edgeos.inc.php b/includes/discovery/os/edgeos.inc.php
new file mode 100644
index 000000000..1f62726dd
--- /dev/null
+++ b/includes/discovery/os/edgeos.inc.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!$os) {
+    if (preg_match("/^EdgeOS/", $sysDescr)) {
+	$os = "edgeos";
+    }
+}
+
+?>
diff --git a/includes/polling/os/edgeos.inc.php b/includes/polling/os/edgeos.inc.php
new file mode 100644
index 000000000..52e68c29c
--- /dev/null
+++ b/includes/polling/os/edgeos.inc.php
@@ -0,0 +1,8 @@
+<?php
+
+# Version is second word in sysDescr
+list(,$version) = explode(" ", $device['sysDescr']);
+
+$features = "";
+
+?>