diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index 91d3193725..ea625685dc 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-20  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_agent_installer,
+	  DEBIAN/make_deb_package.sh,
+	  pandora_agent.spec: Updated to take the collections directory into
+	  account.
+
+	* collections: Added to repository. Collections directory.
+
 2010-07-19  Ramon Novoa  <rnovoa@artica.es>
 
 	* pandora_agent: Added support for file collections.
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 3d194a97a4..687a191bed 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -35,6 +35,7 @@ mkdir -p temp_package/usr/share/pandora_agent/
 mkdir -p temp_package/usr/bin/
 mkdir -p temp_package/usr/sbin/
 mkdir -p temp_package/etc/pandora/plugins
+mkdir -p temp_package/etc/pandora/collections
 mkdir -p temp_package/etc/init.d/
 mkdir -p temp_package/var/log/pandora/
 mkdir -p temp_package/usr/share/man/man1/
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index d0365a4be3..54f1edb6fa 100755
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -88,6 +88,10 @@ if [ ! -e /etc/pandora/plugins ]; then
 	ln -s /usr/share/pandora_agent/plugins /etc/pandora
 fi
 
+if [ ! -e /etc/pandora/collections ]; then
+	ln -s /usr/share/pandora_agent/collections /etc/pandora
+fi
+
 mkdir -p /var/spool/pandora/data_out
 chkconfig pandora_agent_daemon on
 
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 8c40c48633..229133b28a 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -235,7 +235,12 @@ install () {
 	echo "Copying Pandora FMS Agent plugins to $PANDORA_BASE$PANDORA_HOME/plugins..."
 	cp -r plugins $PANDORA_BASE$PANDORA_HOME
 	chmod -R 700 $PANDORA_BASE$PANDORA_HOME/plugins
-    ln -s $PANDORA_BASE$PANDORA_HOME/plugins $PANDORA_BASE$PANDORA_CFG
+    	ln -s $PANDORA_BASE$PANDORA_HOME/plugins $PANDORA_BASE$PANDORA_CFG
+
+	echo "Copying Pandora FMS Agent collections to $PANDORA_BASE$PANDORA_HOME/collections..."
+	cp -r collections $PANDORA_BASE$PANDORA_HOME
+	chmod -R 700 $PANDORA_BASE$PANDORA_HOME/collections
+    	ln -s $PANDORA_BASE$PANDORA_HOME/collections $PANDORA_BASE$PANDORA_CFG
 
 	echo "Copying tentacle client to $PANDORA_BASE$TENTACLE"
 	cp tentacle_client $PANDORA_BASE$TENTACLE