diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index c225f85321..7c8e967c45 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-11  Junichi Satoh  <junichi@rworks.jp>
+
+	* godmode/setup/gis_step_2.php: Added UTF-8 charset to htmlentities().
+
 2010-11-10  Sancho Lerena <slerena@artica.es>
 
 	* pandoradb_data.sql,
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index d239eac222..1eee156a57 100755
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -206,7 +206,7 @@ if ($mapConnectionData != null) {
 // Open Street Map Connection
 $optionsConnectionOSMTable = '<table class="databox" border="0" cellpadding="4" cellspacing="4" width="50%">' .
 		'<tr class="row_0">' .
-			'<td>'  . htmlentities(__("Tile Server URL"), ENT_QUOTES) . ':</td>' .
+			'<td>'  . htmlentities(__("Tile Server URL"), ENT_QUOTES, "UTF-8") . ':</td>' .
 			'<td><input id="type" type="hidden" name="type" value="OSM" />' . print_input_text ('url', $mapConnectionDataUrl, '', 45, 90, true) . '</td>' .
 		'</tr>' . 
 	'</table>';