diff --git a/plugins/network/fping_ b/plugins/network/fping_
new file mode 100755
index 00000000..5741eb38
--- /dev/null
+++ b/plugins/network/fping_
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# Description  : Plugin to monitor a server/network availability.
+# Author       : Thomas VIAL
+# Author URL   : http://tvi.al
+# Usage        : ln -s /path/to/fping_ /etc/munin/plugins/fping_www.google.com
+# Explaination : Will graph connection to www.google.com  
+# Requirements :
+# * fping
+#
+
+target=`basename $0 | sed 's/^fping_//g'`
+item=`echo $target | sed -e 's/\.//g'`
+
+#
+# Config
+#
+
+if [ "$1" = "config" ]; then
+  echo "graph_title ${target} availability"
+  echo "graph_args --base 1000 -r -l 0 -u 100"
+  echo "graph_vlabel Availability in %"
+  echo "graph_category network"
+  echo "graph_info Displays Network Availability"
+  # Failure
+  echo "failure.label Unreachable"
+  echo "failure.draw AREA"
+  echo "failure.colour ff0000"
+  # Success
+  echo "success.label Reachable"
+  echo "success.draw STACK"
+  echo "success.colour 00CC00CC"
+  exit 0
+fi
+
+#
+# Let's go!
+#
+
+fping -q $target
+status=$?
+
+if [ $status -eq 0 ]; then
+    # Success
+    echo "success.value 100"
+    echo "failure.value 0"
+else
+    # Failure
+    echo "success.value 0"
+    echo "failure.value 100" 
+fi
diff --git a/plugins/network/multiping b/plugins/network/multiping
index f5de8a7c..1fb56458 100755
--- a/plugins/network/multiping
+++ b/plugins/network/multiping
@@ -22,12 +22,12 @@
 #
 # Parameters:
 #
-# 	ping_args      - Arguments to ping (default "-c 2 -w 1")
-# 	ping_args2     - Arguments after the host name (required for Solaris)
-# 	ping           - Ping program to use
-# 	hosts          - List of comma-separated hosts to ping (IP address or FQDN)
-# 	names          - Friendly display name of each host given in the "hosts" parameter (comma-separated list).
-# 	                 If not set, "hosts" elements will be used
+#   ping_args      - Arguments to ping (default "-c 2 -w 1")
+#   ping_args2     - Arguments after the host name (required for Solaris)
+#   ping           - Ping program to use
+#   hosts          - List of comma-separated hosts to ping (IP address or FQDN)
+#   names          - Friendly display name of each host given in the "hosts" parameter (comma-separated list).
+#                    If not set, "hosts" elements will be used
 #
 # Arguments for Solaris:
 #      ping_args      -s
@@ -58,45 +58,49 @@ my $ping_args = exists $ENV{ping_args} ? $ENV{ping_args} : '-c 2 -w 1';
 my $ping_args2 = exists $ENV{ping_args2} ? $ENV{ping_args2} : '';
 
 if ($#hosts != $#names) {
-	print "unequal amount of hosts and names\n";
-	exit 1;
+  print "unequal amount of hosts and names\n";
+  exit 1;
 }
 
 if ((exists $ARGV[0]) && ($ARGV[0] eq "autoconf")) {
-	my @ping = `$ping_cmd $ping_args $hosts[0] $ping_args2`;
-	chomp @ping;
-	my $ping = join(" ", @ping);
-	if ($ping =~ m@min/avg/max@) {
-		print "yes\n";
-		exit 0;
-	} else {
-		print "no\n";
-		exit 1;
-	}
+  my @ping = `$ping_cmd $ping_args $hosts[0] $ping_args2`;
+  chomp @ping;
+  my $ping = join(" ", @ping);
+  if ($ping =~ m@min/avg/max@) {
+    print "yes\n";
+    exit 0;
+  } else {
+    print "no\n";
+    exit 1;
+  }
 }
 
 if ((exists $ARGV[0]) && ($ARGV[0] eq "config")) {
-	print "graph_title Ping times\n";
-	print "graph_args --base 1000 -o\n";
-	print "graph_vlabel seconds\n";
-	print "graph_category network\n";
-	print "graph_info This graph shows ping RTT statistics.\n";
-    for (my $site=1; $site<=$#hosts+1; $site++) {
-		print "site$site.label $names[$site-1]\n";
-		print "site$site.info Ping RTT statistics for $hosts[$site-1].\n";
-		print "site$site.draw LINE2\n";
-		print "site${site}_packetloss.label $names[$site-1] packet loss\n";
-		print "site${site}_packetloss.graph no\n";
-	}
+  print "graph_title Ping times\n";
+  print "graph_args --base 1000 -o\n";
+  print "graph_vlabel seconds\n";
+  print "graph_category network\n";
+  print "graph_info This graph shows ping RTT statistics.\n";
+  for (my $site=1; $site<=$#hosts+1; $site++) {
+    my $item = lc($hosts[$site-1]); 
+    $item =~ s/\.//g;
+    print "$item.label $names[$site-1]\n";
+    print "$item.info Ping RTT statistics for $hosts[$site-1].\n";
+    print "$item.draw LINE2\n";
+    print "${item}_packetloss.label $names[$site-1] packet loss\n";
+    print "${item}_packetloss.graph no\n";
+  }
     exit 0;
 }
 
 for (my $site=1; $site<=$#hosts+1; $site++) {
-	my $host = $hosts[$site-1];
-	my @ping = `$ping_cmd $ping_args $host $ping_args2`;
-	chomp @ping;
-	my $ping = join(" ", @ping);
-	print "site".$site.".value ".($1 / 1000)."\n" if ($ping =~ m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@);
-	print "site".$site."_packetloss.value $1\n" if ($ping =~ /(\d+)% packet loss/);
+  my $item = lc($hosts[$site-1]); 
+  $item =~ s/\.//g;
+  my $host = $hosts[$site-1];
+  my @ping = `$ping_cmd $ping_args $host $ping_args2`;
+  chomp @ping;
+  my $ping = join(" ", @ping);
+  print $item.".value ".($1 / 1000)."\n" if ($ping =~ m@min/avg/max.*\s\d+(?:\.\d+)?/(\d+(?:\.\d+)?)/\d+(?:\.\d+)?@);
+  print $item."_packetloss.value $1\n" if ($ping =~ /(\d+)% packet loss/);
 }