diff --git a/html/images/os/vyos.png b/html/images/os/vyos.png
new file mode 100644
index 000000000..698be5b8a
Binary files /dev/null and b/html/images/os/vyos.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index ac2b2c8a2..7fb406f04 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -22,6 +22,8 @@ $config['os_group'][$os_group]['over'][1]['text']   = "Memory Usage";
 $os = "generic";
 $config['os'][$os]['text']              = "Generic Device";
 
+// Linux-based routers/switches
+
 $os = "vyatta";
 $config['os'][$os]['text']              = "Vyatta";
 $config['os'][$os]['type']              = "network";
@@ -30,7 +32,18 @@ $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_mempool";
+$config['os'][$os]['over'][2]['graph']  = "device_ucd_memory";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
+$os = "vyos";
+$config['os'][$os]['text']              = "VyOS";
+$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.
diff --git a/includes/discovery/os/vyatta.inc.php b/includes/discovery/os/vyatta.inc.php
index b1cbda6dd..bdf55a0fb 100644
--- a/includes/discovery/os/vyatta.inc.php
+++ b/includes/discovery/os/vyatta.inc.php
@@ -5,4 +5,4 @@ if (!$os)
   if (preg_match("/^Vyatta/", $sysDescr)) { $os = "vyatta"; }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/os/vyos.inc.php b/includes/discovery/os/vyos.inc.php
new file mode 100644
index 000000000..5c0812121
--- /dev/null
+++ b/includes/discovery/os/vyos.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+if (!$os || $os == "vyatta") {
+    if (preg_match("/^Vyatta VyOS/", $sysDescr) || preg_match("/^VyOS/", $sysDescr)) {
+	$sysDescr = "VyOS";
+	$os = "vyos";
+    }
+}
+
+?>
diff --git a/includes/polling/os/vyos.inc.php b/includes/polling/os/vyos.inc.php
new file mode 100644
index 000000000..ae54d1c3d
--- /dev/null
+++ b/includes/polling/os/vyos.inc.php
@@ -0,0 +1,5 @@
+<?php
+
+list($features, $version) = explode("-", trim(str_replace("VyOS", "", snmp_get($device, "SNMPv2-MIB::sysDescr.0", "-Oqv", "SNMPv2-MIB"))), 2);
+
+?>