diff --git a/html/images/os/endian.png b/html/images/os/endian.png
new file mode 100644
index 0000000000..565f4f44e5
Binary files /dev/null and b/html/images/os/endian.png differ
diff --git a/html/images/os/vyatta.png b/html/images/os/vyatta.png
index ccae6d2be4..74d2281896 100644
Binary files a/html/images/os/vyatta.png and b/html/images/os/vyatta.png differ
diff --git a/html/includes/graphs/application/nginx_req.inc.php b/html/includes/graphs/application/nginx_req.inc.php
index 75e5d7c285..3a1aafe6c0 100644
--- a/html/includes/graphs/application/nginx_req.inc.php
+++ b/html/includes/graphs/application/nginx_req.inc.php
@@ -15,9 +15,9 @@ $rrd_options .= ' DEF:a='.$rrd_filename.':Requests:AVERAGE ';
 
 $rrd_options .= 'COMMENT:"Requests    Current    Average   Maximum\n" ';
 
-$rrd_options .= "LINE2:a#22FF22:Requests\ \     ";
+$rrd_options .= "LINE2:a#22FF22:'Requests  '";
 $rrd_options .= 'GPRINT:a:LAST:"%6.2lf %s" ';
 $rrd_options .= 'GPRINT:a:AVERAGE:"%6.2lf %s" ';
 $rrd_options .= 'GPRINT:a:MAX:"%6.2lf %s\n"  ';
 
-?>
\ No newline at end of file
+?>
diff --git a/html/includes/graphs/device/smokeping_all_common.inc.php b/html/includes/graphs/device/smokeping_all_common.inc.php
index 23cf2a4a06..f2fbf9c9ef 100644
--- a/html/includes/graphs/device/smokeping_all_common.inc.php
+++ b/html/includes/graphs/device/smokeping_all_common.inc.php
@@ -19,7 +19,7 @@ if($width > "500")
 {
   $descr_len = 18;
 } else {
-  $descr_len = 12 + round(($width - 250) / 8);
+  $descr_len = 12 + round(($width - 275) / 8);
 }
 
 if($width > "500")
diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index db3b014a7b..cff9eac670 100755
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -13,6 +13,7 @@ if (!$os)
 
     if (strpos($entPhysicalMfgName, "QNAP") !== FALSE) { $os = "qnap";}
     elseif(strstr($sysObjectId, ".1.3.6.1.4.1.5528.100.20.10.2014")) { $os = "netbotz"; }
+    elseif(strstr($sysDescr, "endian")) { $os = "endian"; }
 
   }
 
diff --git a/includes/polling/os/unix.inc.php b/includes/polling/os/unix.inc.php
index aa4696ed1e..43e7787cec 100755
--- a/includes/polling/os/unix.inc.php
+++ b/includes/polling/os/unix.inc.php
@@ -67,5 +67,17 @@ elseif ($device['os'] == "qnap")
   $version  = snmp_get($device, "ENTITY-MIB::entPhysicalFirmwareRev.1", "-Osqnv");
   $serial   = snmp_get($device, "ENTITY-MIB::entPhysicalSerial.1", "-Osqnv");
 }
+elseif ($device['os'] == "endian")
+{
+  list(,,$version) = explode (" ", $poll_device[sysDescr]);
+  if (strstr($poll_device[sysDescr], "386")|| strstr($poll_device[sysDescr], "486")||strstr($poll_device[sysDescr], "586")||strstr($poll_device[sysDescr], "686")) { $hardware = "Generic x86"; }
+  else if (strstr($poll_device[sysDescr], "x86_64")) { $hardware = "Generic x86 64-bit"; }
+  else if (strstr($poll_device[sysDescr], "sparc32")) { $hardware = "Generic SPARC 32-bit"; }
+  else if (strstr($poll_device[sysDescr], "sparc64")) { $hardware = "Generic SPARC 64-bit"; }
+  else if (strstr($poll_device[sysDescr], "armv5")) { $hardware = "Generic ARMv5"; }
+  else if (strstr($poll_device[sysDescr], "armv6")) { $hardware = "Generic ARMv6"; }
+  else if (strstr($poll_device[sysDescr], "armv7")) { $hardware = "Generic ARMv7"; }
+  else if (strstr($poll_device[sysDescr], "armv")) { $hardware = "Generic ARM"; }
+}
 
 ?>
\ No newline at end of file
diff --git a/includes/static-config.php b/includes/static-config.php
index ae95acfe1a..8ee060e683 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -33,6 +33,7 @@ $config['os'][$os]['over'][1]['text']   = "Processor Usage";
 $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
+
 ### Linux-based OSes here please.
 
 $os = "linux";
@@ -53,6 +54,19 @@ $config['os'][$os]['group']             = "unix";
 $config['os'][$os]['text']              = "QNAP TurboNAS";
 $config['os'][$os]['ifXmcbc']           = 1;
 
+$os = "endian";
+$config['os'][$os]['text']              = "Endian";
+$config['os'][$os]['type']              = "firewall";
+$config['os'][$os]['group']             = "unix";
+$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_mempool";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
+
 ### Other Unix-based OSes here please.
 
 $os = "freebsd";