diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 0eefba9e45..486547f1dc 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-19  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent: Ignore SIGCHLD.
+
 2011-12-16  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent: Empty modules, plugins and collections before
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 39fbf2d1cc..16c9914cb9 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1589,6 +1589,9 @@ sub kill_signal_handler (){
 #Handler TERM signal.
 $SIG{'TERM'} = \&kill_signal_handler;
 
+# Ignore SIGCHLD
+$SIG{'CHLD'} = 'IGNORE';
+
 # Check command line arguments
 print_usage unless ($#ARGV == 0);
 $ConfDir = fix_directory ($ARGV[0]);
@@ -1852,12 +1855,10 @@ while (1) {
 	}
 	# Finish if broker agent
 	else {
-		last;
+		exit (0);
 	}
 }
 
-
-
 __END__
 
 =head1 EXIT STATUS