diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 728b8ef9cd..3fb989b224 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-15  Koichiro Kikuchi  <koichiro@rworks.jp>
+
+	* lib/PandoraFMS/PluginServer.pm: Treat exit status code 124 as
+	 Unknown when plugin type of the module is nagios and module type
+	 is boolean. timeout exits with 124 if command times out.
+
 2012-02-15  Hirofumi Kosaka <kosaka@rworks.jp>
 
 	* util/pandora_manage.pl: Fixed an error in help text.
diff --git a/pandora_server/lib/PandoraFMS/PluginServer.pm b/pandora_server/lib/PandoraFMS/PluginServer.pm
index a3da151e9d..3db09f029c 100644
--- a/pandora_server/lib/PandoraFMS/PluginServer.pm
+++ b/pandora_server/lib/PandoraFMS/PluginServer.pm
@@ -197,7 +197,8 @@ sub data_consumer ($$) {
 			elsif ($ReturnCode == 2){
 				$module_data = 0;
 			} 
-			elsif ($ReturnCode == 3){
+			elsif ($ReturnCode == 3 || $ReturnCode == 124){
+				# 124 should be a exit code of the timeout command (command times out)
 				$module_data = ''; # not defined = Uknown 
 			} 
 			elsif ($ReturnCode == 4){