diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 9ec9eccb42..5ed6e4b9a6 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25  Sancho Lerena <slerena@gmail.com>
+
+	* linux/pandora_agent: Fixed problem parsing async_string.
+
+	* linux/pandora_agent.conf: Sample of async_string module.
+
 2008-09-04  Evi Vanoost  <vanooste@rcbi.rochester.edu>
 
 	* mac_osx/plugins/XServeRAID: Updated for 2.0 type agents. Added
diff --git a/pandora_agents/linux/pandora_agent b/pandora_agents/linux/pandora_agent
index feecb3f6f9..8df1124be6 100755
--- a/pandora_agents/linux/pandora_agent
+++ b/pandora_agents/linux/pandora_agent
@@ -488,7 +488,7 @@ do
          	if [ ! -z "`echo $a | grep -e '^module_type'`" ]
          	then
             		mtype=`echo $a | awk '{ print $2 }' `
-            		if [ ! -z "`echo $mtype | grep 'generic_data_string'`" ]
+            		if [ ! -z "`echo $mtype | grep 'generic_data_string'`" ] || [ ! -z "`echo $mtype | grep 'async_string'`" ]
      			then
    				flux_string=1
      			else
diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf
index 7252fac2c2..2187f66569 100755
--- a/pandora_agents/linux/pandora_agent.conf
+++ b/pandora_agents/linux/pandora_agent.conf
@@ -135,6 +135,14 @@ module_type generic_proc
 module_exec ps -Af | grep sshd | grep -v "grep" | wc -l
 module_end
 
+# Async data example
+ 
+module_begin
+module_name LastLogin
+module_type async_string
+module_exec last | head -1
+module_end
+
 # Plugin example
 
 # This parses /var/log/syslog file, under the module name "syslog"