diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index a4beddf7f5..ffdf9a95dc 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-18  Sergio Martin <sergio.martin@artica.es>
+
+	* unix/Linux/pandora_agent.conf: Change default memory modules to get it with free command
+	and using postprocessing to unit conversion. Bug: 3284422
+
 2011-07-14  Vanessa Gil  <vanessa.gil@artica.es>
 
 	* win32/bin/pandora_agent.conf: Add example lines with drone agents and additional configuration files. 
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 62a438b7d6..900857bfaa 100755
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -178,16 +178,17 @@ module_end
 module_begin
 module_name memfree
 module_type generic_data
-module_exec cat /proc/meminfo  | grep MemFree | awk '{ print $2 }'
+module_exec free -m | grep buffers/cache | awk '{print $4}'
+module_description Free memory in MB
 module_end
 
-# This module uses postprocess feature to pass postprocess value to module
+# This module uses postprocess feature to unit conversion
 module_begin
 module_name memused
 module_type generic_data
-module_exec cat /proc/meminfo | grep "Active:"  | awk '{ print $2 }'
-module_postprocess 0,976
-module_description Meminfo postprocess
+module_exec free -k | grep buffers/cache | awk '{print $3}'
+module_postprocess 0,000976
+module_description Used memory in KB postprocessed to be in MB
 module_end
 
 module_begin