diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 95ab33bd4f..03822650f1 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-20  Mario Pulido <mario.pulido@artica.es>
+	
+	* godmode/setup/setup_general.php: Add help tip in Timezone Setup
+
 2013-03-19  Ramon Novoa  <rnovoa@artica.es>
 
 	* godmode/servers/modificar_server.php: Disable auto-refresh when reset
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index c9e8adea59..1f1d6f035d 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -182,7 +182,7 @@ foreach ($timezones as $timezone) {
 	}
 }
 
-$table->data[23][0] = __('Timezone setup');
+$table->data[23][0] = __('Timezone setup'). ' ' . ui_print_help_tip (__('Must have the same time zone as the system or database to avoid mismatches of time.'), true);
 $table->data[23][1] = html_print_input_text_extended ('timezone_text', $config["timezone"], 'text-timezone_text', '', 25, 25, false, '', 'readonly', true); 
 $table->data[23][1] .= '<a id="change_timezone">'.html_print_image ('images/pencil.png', true, array ('title' => __('Change timezone'))).'</a>';
 $table->data[23][1] .= "&nbsp;&nbsp;". html_print_select($zone_name, 'zone', $zone_selected, 'show_timezone();', '', '', true);