diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 19e9f5ca0c..5bfcca8624 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-10  Junichi Satoh  <junichi@rworks.jp>
+
+	* lib/PandoraFMS/Tools.pm: Added a parameter of unsafe_chars, '<>&',
+	to encode_entities(). It is support for multibyte characters.
+	If it is not defined, records with multibyte characters on database
+	are destroyed by 'pandora_recode_db.pl'. :(
+
 2010-11-08  Sergio Martin <srgio.martin@artica.es>
 
 	* util/pandora_sync_db.pl: Added two special 
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 3b7be673af..ef78036368 100644
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -85,7 +85,7 @@ sub pandora_trash_ascii {
 sub safe_input($) {
 	my $value = shift;
 
-	$value = encode_entities ($value);
+	$value = encode_entities ($value, "<>&");
 		
 	#//Replace the character '\' for the equivalent html entitie
 	$value =~ s/\\/&#92;/gi;