diff --git a/html/images/os/gentoo.png b/html/images/os/gentoo.png
new file mode 100644
index 000000000..c9f69304d
Binary files /dev/null and b/html/images/os/gentoo.png differ
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 03f5f0e49..edaa32c7f 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -560,6 +560,12 @@ $os = "engenius";
 $config['os'][$os]['type']              = "wireless";
 $config['os'][$os]['text']              = "EnGenius Access Point";
 $config['os'][$os]['icon']              = "engenius";
+$config['os'][$os]['over'][0]['graph']  = "device_ucd_cpu";
+$config['os'][$os]['over'][0]['text']   = "Processor Usage";
+$config['os'][$os]['over'][1]['graph']  = "device_ucd_memory";
+$config['os'][$os]['over'][1]['text']   = "Memory Usage";
+$config['os'][$os]['over'][2]['graph']  = "device_bits";
+$config['os'][$os]['over'][2]['text']   = "Device Traffic";
 
 $os = "airport";
 $config['os'][$os]['type']              = "wireless";
diff --git a/includes/discovery/os/freebsd.inc.php b/includes/discovery/os/freebsd.inc.php
index 9ebea197a..d57d9e27e 100755
--- a/includes/discovery/os/freebsd.inc.php
+++ b/includes/discovery/os/freebsd.inc.php
@@ -2,9 +2,10 @@
 
 if (!$os)
 {
-  if (strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; }    // It's FreeBSD!
-  if (strstr($sysDescr, "Voswall")) { $os = "voswall"; }    // Oh-No-It-Isn't!!
-  if (strstr($sysDescr, "m0n0wall")) { $os = "monowall"; }  // Ditto
+  if (strstr($sysDescr, "Voswall")) { $os = "voswall"; } // Oh-No-It-Isn't!!
+  else if (strstr($sysDescr, "m0n0wall")) { $os = "monowall"; } // Ditto
+  else if (strstr($sysDescr, "pfSense")) { $os = "pfsense"; }
+  else if (strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; } // It's FreeBSD!
 }
 
-?>
\ No newline at end of file
+?>