diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index cb5bdfdee4..e2e7b54e32 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-21  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent_daemon: Changed status return codes to conform to LSB
+	  specs. Fixes bug #2397.
+
 2013-10-13  Junichi Satoh  <junichi@rworks.jp>
 
 	* tentacle_server: Upgraded to 0.4.0. (Imported from trunk of
diff --git a/pandora_agents/unix/pandora_agent_daemon b/pandora_agents/unix/pandora_agent_daemon
index 6ec7b1f126..b8741c2ad9 100755
--- a/pandora_agents/unix/pandora_agent_daemon
+++ b/pandora_agents/unix/pandora_agent_daemon
@@ -109,10 +109,11 @@ case "$1" in
 		if [ -z "$PANDORA_PID" ]
 		then
 			echo "Pandora FMS Agent is not running."
+			exit 3
 		else
 			echo "Pandora FMS Agent is running with PID $PANDORA_PID."
+			exit 0
 		fi
-		exit 0
 	;;
 
 	force-reload|restart)