diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index ea625685dc..12092255d5 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-20  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent_installer: Fixed some directories and permissions.
+
 2010-07-20  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent_installer,
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 229133b28a..3542a49811 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -99,6 +99,7 @@ uninstall () {
 	if [ -d $PANDORA_BASE$PANDORA_TEMP/data_in ]
 	then
 		echo "You have a Pandora Server in this machine. Then don't delete "$PANDORA_TEMP
+		rm -Rf $PANDORA_BASE$PANDORA_TEMP/data_out 2> /dev/null
 	else
 		rm -Rf $PANDORA_BASE$PANDORA_TEMP 2> /dev/null
 	fi 
@@ -253,9 +254,8 @@ install () {
     	chmod 644 $PANDORA_BASE/$PANDORA_MAN/man1/pandora_agent.1.gz
 
 	echo "Setting secure permissions and ownership for all Pandora FMS Agent files..."
-	chown -R root $PANDORA_BASE$PANDORA_HOME
-	chmod -R 600 $PANDORA_BASE$PANDORA_TEMP
-	chown root $PANDORA_BASE$PANDORA_TEMP
+	chown -R $PANDORA_USER $PANDORA_BASE$PANDORA_HOME
+	chmod -R 700 $PANDORA_BASE$PANDORA_TEMP/data_out
 	chmod 640 $PANDORA_BASE$PANDORA_LOG_DIR/$PANDORA_LOG
 	if [ "$OS_NAME" = "FreeBSD" ]
 	then