diff --git a/html/includes/graphs/device/nfsen_common.inc.php b/html/includes/graphs/device/nfsen_common.inc.php
index e71c96c041..4c941a6074 100644
--- a/html/includes/graphs/device/nfsen_common.inc.php
+++ b/html/includes/graphs/device/nfsen_common.inc.php
@@ -9,10 +9,14 @@ foreach ( $config['nfsen_rrds'] as $nfsenrrds )
   if ($configs[strlen($nfsenrrds)-1] != '/') { $nfsenrrds .= '/'; }
 
   # convert dots in filename to underscores
+  $nfsensuffix = "";
+  if ($config['nfsen_suffix']) { $nfsensuffix = $config['nfsen_suffix']; }
   $basefilename_underscored = preg_replace('/\./', $config['nfsen_split_char'], $device['hostname']);
-  if (is_file($nfsenrrds . $basefilename_underscored . ".rrd"))
+  $nfsen_filename = (strstr($basefilename_underscored, $nfsensuffix, true));
+
+  if (is_file($nfsenrrds . $nfsen_filename . ".rrd"))
   {
-    $rrd_filename = $nfsenrrds . $basefilename_underscored . ".rrd"; 
+    $rrd_filename = $nfsenrrds . $nfsen_filename . ".rrd"; 
 
     $flowtypes = array('tcp', 'udp', 'icmp', 'other');
 
diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 6bd97de232..610088e7f2 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -218,8 +218,11 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
       foreach ($config['nfsen_rrds'] as $nfsenrrds)
       {
         if ($configs[strlen($nfsenrrds)-1] != '/') { $nfsenrrds .= '/'; }
+        $nfsensuffix = "";
+        if ($config['nfsen_suffix']) { $nfsensuffix = $config['nfsen_suffix']; }
         $basefilename_underscored = preg_replace('/\./', $config['nfsen_split_char'], $device['hostname']);
-        if (is_file($nfsenrrds . $basefilename_underscored . ".rrd")) { $nfsen_rrd_file = $nfsenrrds . $basefilename_underscored . ".rrd"; }
+        $nfsen_filename = (strstr($basefilename_underscored, $nfsensuffix, true));
+        if (is_file($nfsenrrds . $nfsen_filename . ".rrd")) { $nfsen_rrd_file = $nfsenrrds . $basefilename_underscored . ".rrd"; }
       }
     }
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 7c68935fea..c51ea97d50 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -157,6 +157,7 @@ $config['rancid_ignorecomments'] 	= 0; # Ignore lines starting with #
 $config['nfsen_enable'] = 0;
 #$config['nfsen_split_char']   = "_";
 #$config['nfsen_rrds']   = "/var/nfsen/profiles-stat/live/";
+#$config['nfsen_suffix']   = "_yourdomain_com";
 
 ### Ignores & Allows
 
diff --git a/poll-reachability.php b/poll-reachability.php
index 43a505d665..dee7de181c 100755
--- a/poll-reachability.php
+++ b/poll-reachability.php
@@ -55,7 +55,7 @@ while ($device = mysql_fetch_assoc($device_query))
       }
     }
 
-    log_event("Device status changed to $stat", $device, strtolower($stat)));
+    log_event("Device status changed to $stat", $device, strtolower($stat));
     echo("Status Changed!\n");
   }
 }