diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 2134822391..1c750e555e 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-07  Sergio Martin <sergio.martin@artica.es>
+
+	* operation/events/events.build_table.php: Added carriage
+	return support in Instructions column in events view
+
 2013-03-07  Junichi Satoh  <junichi@rworks.jp>
 
 	* include/help/ja/help_view_services.php,
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index 263ba2489b..51a0964875 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -424,14 +424,14 @@ foreach ($result as $event) {
 	if (in_array('instructions',$show_fields)) {
 		switch($event['event_type']) {
 			case 'going_unknown':
-				$data[$i] = ui_print_truncate_text($event["unknown_instructions"]);
+				$data[$i] = ui_print_truncate_text(str_replace("\n","<br>", io_safe_output($event["unknown_instructions"])));
 				break;
 			case 'going_up_critical':
 			case 'going_down_critical':
-				$data[$i] = ui_print_truncate_text($event["critical_instructions"]);
+				$data[$i] = ui_print_truncate_text(str_replace("\n","<br>", io_safe_output($event["critical_instructions"])));
 				break;
 			case 'going_down_warning':
-				$data[$i] = ui_print_truncate_text($event["warning_instructions"]);
+				$data[$i] = ui_print_truncate_text(str_replace("\n","<br>", io_safe_output($event["warning_instructions"])));
 				break;
 			default:
 				$data[$i] = '';