diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 21dfee5546..ce2fad20cd 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-29  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Tools.pm: Added ' to the list of characters to HTML
+	  encode.
+
 2010-11-22  Raúl Mateos  <raulofpandora@gmail.com>
 
 	* pandora_server_upgrade, pandora_server_installer, README: Updated version
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index ef78036368..cf4ebc2405 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;