diff --git a/plugins/network/ping/ping b/plugins/network/ping/ping
index 0ee6745d..37bcad2d 100755
--- a/plugins/network/ping/ping
+++ b/plugins/network/ping/ping
@@ -24,19 +24,19 @@ ping - Plugin to monitor ping times
 
 Configuration example
 
- [ping]
+ [ping*]
  env.hosts mail.example.org,6:www.example.org,AAAA:search.example.org
  env.names Mail,Web,Search
  env.fork yes
 
 Configuration example for Solaris
 
- [multiping]
+ [ping*]
  env.host www.example.org mail.example.org
  env.ping_args -s
  env.ping_args2 56 2
 
-You can also append plugin name with '_packetloss' to get packet loss statistics.
+You can also append '_packetloss' to the plugin filename for packet loss statistics.
 
 =head1 AUTHOR
 
@@ -90,7 +90,7 @@ my $config_mode = ($ARGV[0] and $ARGV[0] eq 'config');
 if ($config_mode) {
 	print "graph_title " . ($packetloss_mode ? "Ping packet loss" : "Ping times") . "\n";
 	print "graph_args --base 1000 -l 0\n";
-	print "graph_vlabel " . ($packetloss_mode ? "packets" : "seconds") . "\n";
+	print "graph_vlabel " . ($packetloss_mode ? "%" : "seconds") . "\n";
 	print "graph_category network\n";
 	print "graph_info This graph shows ping " . ($packetloss_mode ? "packet loss" : "RTT") . " statistics.\n";
 }
@@ -142,7 +142,7 @@ for (my $host_i = 0; $host_i < @host_addrs; ++$host_i) {
 	my @h_addrs = ($host_addrs[$host_i]);
 	my $h_ping = $host_ping[$host_i];
 	my $h_resolv = $host_resolv[$host_i];
-	my $h_name = $host_names[$host_i];
+	my $h_name = ($host_names[$host_i] or $h_addrs[0]);
 
 	if ($h_resolv) {
 		# we have to resolve the host to (probably multiple) addresses
diff --git a/plugins/network/ping/ping-day.png b/plugins/network/ping/ping-day.png
new file mode 100644
index 00000000..78dd301d
Binary files /dev/null and b/plugins/network/ping/ping-day.png differ
diff --git a/plugins/network/ping/ping-year.png b/plugins/network/ping/ping-year.png
deleted file mode 100644
index a070224e..00000000
Binary files a/plugins/network/ping/ping-year.png and /dev/null differ