diff --git a/doc/Support/Configuration.md b/doc/Support/Configuration.md
index 43d11cffd..68cb55251 100644
--- a/doc/Support/Configuration.md
+++ b/doc/Support/Configuration.md
@@ -33,6 +33,8 @@ $config['fping']            = "/usr/bin/fping";
 $config['fping6']           = "/usr/bin/fping6";
 $config['fping_options']['retries'] = 3;
 $config['fping_options']['timeout'] = 500;
+$config['fping_options']['count'] = 3;
+$config['fping_options']['millisec'] = 5;
 ```
 fping configuration options, this includes setting the timeout and retry options.
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 24b43b99f..0880829de 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -44,6 +44,7 @@ $config['fping']            = "/usr/bin/fping";
 $config['fping_options']['retries'] = 3;
 $config['fping_options']['timeout'] = 500;
 $config['fping_options']['count'] = 3;
+$config['fping_options']['millisec'] = 5;
 $config['fping6']           = "/usr/bin/fping6";
 $config['snmpwalk']         = "/usr/bin/snmpwalk";
 $config['snmpget']          = "/usr/bin/snmpget";
diff --git a/includes/functions.php b/includes/functions.php
index fb4ba1b73..a53d76d99 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -498,7 +498,9 @@ function isPingable($hostname,$device_id = FALSE)
     if(is_numeric($config['fping_options']['count']) || $config['fping_options']['count'] > 0) {
         $fping_params .= ' -c ' . $config['fping_options']['count'];
     }
-   //$status = shell_exec($config['fping'] . "$fping_params -e $hostname 2>/dev/null");
+    if(is_numeric($config['fping_options']['millisec']) || $config['fping_options']['millisec'] > 0) {
+        $fping_params .= ' -p ' . $config['fping_options']['millisec'];
+    }
    $response = array();
    $status = fping($hostname,$fping_params);
    if ($status['loss'] < 0 || $status['loss'] == 100) {