diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index fd2f2d7d28..b485659f82 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-10 Miguel de Dios  <miguel.dedios@artica.es>
+
+	* pandora_agent_installer: fix bug when uninstall the agent in the same
+	machine that it have a Pandora Server, that the uninstaller deleted the
+	dirs share with Pandora Server (/var/spool/pandora/*)
+	 
 2010-01-27  Sancho Lerena <slerena@artica,es>
 
 	* plugins/files_indir: New agent to detect if files in a specficied
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index e409fbbec9..01c4080a2b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -79,7 +79,14 @@ fi
 uninstall () {
 	echo "Removing Pandora FMS Agent..."
 	rm -Rf $PANDORA_BIN
-	rm -Rf $PANDORA_TEMP
+	
+	#Test if exist Pandora Server in this machine
+	if [ -d $PANDORA_TEMP/data_in ]
+	then
+		echo "You have a Pandora Server in this machine. Then don't delete "$PANDORA_TEMP
+	else
+		rm -Rf $PANDORA_TEMP
+	fi
 	rm -Rf $PANDORA_CFG/pandora_agent.conf
 	
 	rm -Rf /etc/init.d/pandora_agent_daemon 2> /dev/null