diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 390b50ddd0..b837bdae71 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-22  Sergio Martin <sergio.martin@artica.es>
+
+	* util/pandora_manage.pl: Fixed codification bug in the
+	conf modules declaration
+
 2010-12-22  Ramon Novoa  <rnovoa@artica.es>
 
 	* util/pandora_recode_db.pl: Removed from repository. Not
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index c2634f4fe2..22dea5ada6 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -1322,7 +1322,7 @@ sub pandora_manage_main ($$$) {
 					delete $module->{'id_policy'};
 					
 					#Store the conf data
-					$configuration_data .= "\n\n$module->{'configuration_data'}";
+					$configuration_data .= safe_output("\n\n$module->{'configuration_data'}");
 
 					delete $module->{'configuration_data'};
 										
@@ -1366,8 +1366,8 @@ sub pandora_manage_main ($$$) {
 					}
 				
 					#Add the conf information to the agent conf file
-					enterprise_hook('pandora_create_policy_conf_info',[$conf, $policy_name, $configuration_data,$agent_name,$dbh]);
-				
+					enterprise_hook('pandora_create_policy_conf_info',[$conf, $policy_name, $configuration_data, $agent_name, $dbh]);
+
 					# Flag applyed the agent
 					enterprise_hook('pandora_apply_agent_policy',[$policy_id, $id_agent, $dbh]);