diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 14a0588f34..d68ec007c9 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12  Junichi Satoh  <junichi@rworks.jp>
+
+	* general/logon_ok.php: Fixed bad representation that __('ago') is
+	shown when "Timestamp or time comparation" is set to timestamp.
+	
 2011-11-11 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* godmode/setup/gis_step_2.php: Fixed a small bug with a button.
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index d1d3a172bd..025d9ffbea 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -49,9 +49,14 @@ switch ($config["dbtype"]) {
 $news = db_get_all_rows_sql ($sql);
 if ($news !== false) {
 	echo '<table cellpadding="4" cellspacing="4" class="databox">';
+	if ($config["prominent_time"] == "timestamp") {
+		$comparation_suffix = "";
+	} else {
+		$comparation_suffix = __('ago');
+	}
 	foreach ($news as $article) {
 		echo '<tr><th><b>'.$article["subject"].'</b></th></tr>';
-		echo '<tr><td>'.__('by').' <b>'.$article["author"].'</b> <i>' . ui_print_timestamp ($article["timestamp"], true).'</i> ' . __('ago') . '</td></tr>';
+		echo '<tr><td>'.__('by').' <b>'.$article["author"].'</b> <i>' . ui_print_timestamp ($article["timestamp"], true).'</i> ' . $comparation_suffix . '</td></tr>';
 		echo '<tr><td class="datos">';
 		echo nl2br ($article["text"]);
 		echo '</td></tr>';