diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 50e37809ea..6c96a0a68b 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-20  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_server_installer: Delete the spool/pandora directory
+	  if no agent is installed on the same machine.
+
 2010-07-20  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_server_installer: Set safer permissions for data_in/conf.
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 95f765d569..fb21a9b7c9 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -432,7 +432,11 @@ uninstall () {
 		fi
 	fi
 	echo "Removing Pandora Servers"
-	rm -Rf $PANDORA_SPOOL/data_in/
+	if [ -d $PANDORA_SPOOL/data_out ]; then
+		rm -Rf $PANDORA_SPOOL/data_in
+	else
+		rm -Rf $PANDORA_SPOOL
+	fi
 
 	echo "If the user Pandora is not being used for any other operations, please delete using the following commands:"
 	echo "	userdel pandora"