diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index c2f1c9fe46..e1c734ce3c 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,10 @@
+2009-06-11  Manuel Arostegui <marostegui@artica.es>
+
+	* linux/pandora_agent_installer: Changed the uninstall options
+	cause if you had the agent in the same machine as the server and the
+	agent is deleted, it would delete /etc/pandora/ (which includes
+	pandora_server.conf) instead of just pandora_agent.conf.
+
 2009-05-05  Evi Vanoost  <vanooste@rcbi.rochester.edu>
 
 	* mac_osx/plugins/ipmi2xml/impi2xml.php, 
diff --git a/pandora_agents/linux/pandora_agent_installer b/pandora_agents/linux/pandora_agent_installer
index 1e315e4223..ea0145fa52 100755
--- a/pandora_agents/linux/pandora_agent_installer
+++ b/pandora_agents/linux/pandora_agent_installer
@@ -15,6 +15,7 @@ PANDORA_CFG=/etc/pandora
 PANDORA_LOG=/var/log/pandora/pandora_agent.log
 PANDORA_STARTUP=/etc/init.d/pandora_agent_daemon
 TENTACLE=/usr/bin/tentacle_client
+PANDORA_CFG_FILE=/etc/pandora/pandora_agent.conf
 
 FORCE=0
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
@@ -33,7 +34,7 @@ uninstall () {
         echo "Removing Pandora FMS Agent..."
         rm -Rf $PANDORA_BIN
         rm -Rf $PANDORA_TEMP
-        rm -Rf $PANDORA_CFG
+        rm -Rf $PANDORA_CFG_FILE
         rm -Rf $PANDORA_STARTUP
         rm -Rf $PANDORA_HOME
         rm -Rf $PANDORA_LOG