diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2d0ebe7af8..d2e096b2ef 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29  Junichi Satoh  <junichi@rworks.jp>
+
+	* include/functions_events.php: Fixed a bug that event's comment
+	is not shown when it includes newline.
+
 2014-07-28  Junichi Satoh  <junichi@rworks.jp>
 
 	* operation/agentes/estado_agente.php: Fixed sql error.
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index a1f0295957..49052a6dd0 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2253,6 +2253,7 @@ function events_page_comments ($event) {
 	$table_comments->class = "alternate rounded_cells";
 	
 	$event_comments = io_safe_output($event["user_comment"]);
+	$event_comments = str_replace("\n", "<br>", $event_comments);
 	
 	// If comments are not stored in json, the format is old
 	$event_comments_array = json_decode($event_comments, true);