diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index fe916646ac..0c5e43b4ef 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-05  Sancho Lerena <slerena@gmail.com>
+
+	* pandora_network.pm: Small bug that causes some hosts to do not reply
+	at ICMP request with a small payload (1 byte). Now uses by default 
+	32 bytes per reply.
+
 2007-06-04  Raúl Mateos  <rmateos@netscape.net>
 
 	* pandora_server, pandora_network, pandora_snmpconsole: Added FMS text.
diff --git a/pandora_server/bin/pandora_network.pl b/pandora_server/bin/pandora_network.pl
index 4a75a68617..bfa5965f5d 100755
--- a/pandora_server/bin/pandora_network.pl
+++ b/pandora_server/bin/pandora_network.pl
@@ -333,8 +333,8 @@ sub pandora_ping_icmp {
 	if (!defined($dest)) {
 		return 0;
 	}
-	
-	$p = Net::Ping->new("icmp",$l_timeout);
+	// Some hosts don't accept ICMP with too small payload. Use 32Bytes	
+	$p = Net::Ping->new("icmp",$l_timeout,32);
 	$result = $p->ping($dest);
 	
 	# Check for valid result
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index c44eda7433..7db5615c45 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -80,7 +80,7 @@ reconserver 1
 
 # Network timeout (in seconds) for timeout in network connections for Network agents
 
-network_timeout 8
+network_timeout 9
 
 # Server keepalive (in seconds)