diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index b88ee1dd5..305e2cc4d 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -404,6 +404,9 @@ $config['bad_iftype'][] = "mpls";
 $config['bad_if_regexp'][] = "/^ng[0-9]+$/";
 $config['bad_if_regexp'][] = "/^sl[0-9]/";
 
+// Rewrite Interfaces
+$config['rewrite_if_regexp']['/^cpu interface/'] = 'Mgmt';
+
 $config['processor_filter'][] = "An electronic chip that makes the computer work.";
 
 $config['ignore_mount_removable']  = 1; # Ignore removable disk storage
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 476b0a027..81dccc588 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1088,6 +1088,15 @@ $config['os'][$os]['text']              = "Datacom";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "datacom";
 
+// UBNT EdgeSwitch 750W
+$os = "edgeswitch";
+$config['os'][$os]['text']              = "EdgeSwitch";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "ubiquiti";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+$config['os'][$os]['ifname']            = 1;
+
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/edgeswitch.inc.php b/includes/discovery/os/edgeswitch.inc.php
new file mode 100644
index 000000000..56ff87e42
--- /dev/null
+++ b/includes/discovery/os/edgeswitch.inc.php
@@ -0,0 +1,6 @@
+<?php
+if (!$os) {
+	if (strstr($sysObjectId, ".1.3.6.1.4.1.4413")) {
+		$os = "edgeswitch";
+	}
+}
diff --git a/includes/polling/os/edgeswitch.inc.php b/includes/polling/os/edgeswitch.inc.php
new file mode 100644
index 000000000..f2549f960
--- /dev/null
+++ b/includes/polling/os/edgeswitch.inc.php
@@ -0,0 +1,7 @@
+<?php
+//SNMPv2-MIB::sysDescr.0 = STRING: EdgeSwitch 48-Port 750W, 1.1.2.4767216, Linux 3.6.5-f4a26ed5
+if( preg_match('/^(EdgeSwitch .*), (.*), Linux .*$/', $poll_device['sysDescr'], $regexp_result)) {
+	$hardware = $regexp_result[1];
+	$version = $regexp_result[2];
+	$serial = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.11.1", "-Ovq") , '" ');
+}