diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index cc7229b3eb..48312ea85f 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-30  Sancho Lerena <slerena@artica.es>
+
+	* linux/pandora_agent_installer: Fixed "accidental" deletion
+	of /var/spool/pandora uninstalling the agent, now only
+	delete /var/spool/pandora/data_out 
+
 2009-09-25  Evi Vanoost <vanooste@rcbi.rochester.edu>
 
 	* mac_osx/pandora_fms/pandora_fms, 
diff --git a/pandora_agents/linux/pandora_agent_installer b/pandora_agents/linux/pandora_agent_installer
index d26b0623b6..19b7240865 100755
--- a/pandora_agents/linux/pandora_agent_installer
+++ b/pandora_agents/linux/pandora_agent_installer
@@ -11,7 +11,7 @@
 PI_VERSION=3.0
 PANDORA_BIN=/usr/bin/pandora_agent
 PANDORA_HOME=/usr/share/pandora_agent
-PANDORA_TEMP=/var/spool/pandora
+PANDORA_TEMP=/var/spool/pandora/data_out 
 PANDORA_CFG=/etc/pandora
 PANDORA_LOG=/var/log/pandora/pandora_agent.log
 PANDORA_STARTUP=/etc/init.d/pandora_agent_daemon
@@ -74,7 +74,7 @@ uninstall () {
         rm -Rf $PANDORA_STARTUP
         rm -Rf $PANDORA_HOME
         rm -Rf $PANDORA_LOG
-		rm -Rf $TENTACLE
+	rm -Rf $TENTACLE
         echo "Done"
 }
 
@@ -107,8 +107,7 @@ install () {
         # Create directories
         echo "Creating Pandora FMS Agent home directory at $PANDORA_HOME ..."
         mkdir $PANDORA_HOME 2> /dev/null
-        mkdir $PANDORA_TEMP 2> /dev/null
-        mkdir $PANDORA_TEMP/data_out 2> /dev/null
+        mkdir -p $PANDORA_TEMP/data_out 2> /dev/null
         mkdir $PANDORA_CFG 2> /dev/null
 		mkdir /var/log/pandora 2> /dev/null