diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index ee12883149..0c16bba176 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-30  Sancho Lerena <slerena@artica.es>
+
+	* DEBIAN/postinst,
+	DEBIAN/make_deb_package.sh: Solved problem with plugins in agent distribution
+	on Debian. 
+
 2014-04-14  Ramon Novoa  <rnovoa@artica.es>
 
 	* plugins/who.sh: Output some text when there are no users connected.
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 73ff313101..24dc78036d 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -66,6 +66,11 @@ cp Linux/pandora_agent.conf temp_package/etc/pandora/
 
 cp -aRf man/man1/* temp_package/usr/share/man/man1/
 
+# Relocate plugins to the final dir and delete 
+mv temp_package/usr/share/pandora_agent/plugins/* temp_package/etc/pandora/plugins
+
+echo "Official plugins are placed on /etc/pandora/plugins" > temp_package/usr/share/pandora_agent/plugins/README
+
 #Disabled, now the package overwrite the previous files.
 ##Create a temp file for to update files of plugins dir but don't crush dir.
 ##cp -aRf temp_package/usr/share/pandora_agent/plugins temp_package/tmp
diff --git a/pandora_agents/unix/DEBIAN/postinst b/pandora_agents/unix/DEBIAN/postinst
index 0dbf9ee0d7..6fdd0d1517 100755
--- a/pandora_agents/unix/DEBIAN/postinst
+++ b/pandora_agents/unix/DEBIAN/postinst
@@ -8,19 +8,6 @@ PANDORA_CFG=/etc/pandora
 
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
 
-#Disabled, now the package overwrite the previous files.
-#echo "Copy new version of plugins into dir"
-#cp -i /tmp/plugins/* /usr/share/pandora_agent/plugins/
-#rm /tmp/plugins -rf
-
-echo "Linking Pandora FMS Agent plugins directory to $PANDORA_CFG/plugins..."
-rm $PANDORA_CFG/plugins 2> /dev/null
-ln -s $PANDORA_HOME/plugins $PANDORA_CFG 2> /dev/null
-
-echo "Linking Pandora FMS Agent configuration to $PANDORA_CFG/pandora_agent.conf..."
-#~ rm $PANDORA_CFG/pandora_agent.conf 2> /dev/null
-#~ ln -s $PANDORA_HOME/pandora_agent.conf $PANDORA_CFG/pandora_agent.conf 
-
 echo "Start log of agent."
 echo "$LOG_TIMESTAMP Pandora FMS installer has created this file at startup" > $PANDORA_LOG