diff --git a/pandora_agents/unix/ChangeLog b/pandora_agents/unix/ChangeLog
index f1461135bd..0882cfa7bb 100644
--- a/pandora_agents/unix/ChangeLog
+++ b/pandora_agents/unix/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-10  Miguel de Dios  <miguel.dedios@artica.es>
+	
+	* DEBIAN/postinst, DEBIAN/prerm, DEBIAN/make_deb_package.sh: fixed the use
+	pandora_exec for Pandora Server and Pandora Agent, now make a
+	pandora_exec.agent and try to link to pandora_exec.
+	
+	Fixes: #3106578
+
 2010-11-10  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* DEBIAN/make_deb_package.sh: fixed the include the bigger NT4 files in the
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 1a8856a7f2..f82829c906 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -50,7 +50,7 @@ chmod 755 -R temp_package/DEBIAN
 #cp -aRf * temp_package/usr/share/pandora_agent/
 #but don't copy recursive the temp_package into temp_package
 
-for item in `ls | grep -v NT4 | grep -v temp_package`
+for item in `ls | grep -v NT4 | grep -v AIX | grep -v FreeBSD | grep -v HP-UX | grep -v SunOS | grep -v temp_package`
 do
 	#if  [ \( $item != 'temp_package' \) -a \( $item != 'NT4' \) ]
 	#then
@@ -59,7 +59,7 @@ do
 done
 cp -aRf tentacle_client temp_package/usr/bin/
 cp -aRf pandora_agent temp_package/usr/bin/
-cp -aRf pandora_exec temp_package/usr/bin/
+cp -aRf pandora_exec temp_package/usr/bin/pandora_exec.agent
 cp -aRf pandora_agent_daemon temp_package/etc/init.d/pandora_agent_daemon
 cp Linux/pandora_agent.conf temp_package/etc/pandora/
 
diff --git a/pandora_agents/unix/DEBIAN/postinst b/pandora_agents/unix/DEBIAN/postinst
index 1b18887746..2d691e86d8 100755
--- a/pandora_agents/unix/DEBIAN/postinst
+++ b/pandora_agents/unix/DEBIAN/postinst
@@ -13,6 +13,9 @@ echo "Copy new version of plugins into dir"
 cp -i /tmp/plugins/* /usr/share/pandora_agent/plugins/
 rm /tmp/plugins -rf
 
+echo "Linking pandora_exec..."
+ln -s /usr/bin/pandora_exec.agent /usr/bin/pandora_exec 2> /dev/null
+
 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
diff --git a/pandora_agents/unix/DEBIAN/prerm b/pandora_agents/unix/DEBIAN/prerm
index 0079ff264a..b011740004 100755
--- a/pandora_agents/unix/DEBIAN/prerm
+++ b/pandora_agents/unix/DEBIAN/prerm
@@ -10,3 +10,8 @@ PANDORA_CFG=/etc/pandora
 
 update-rc.d -f pandora_agent_daemon remove
 
+rm /usr/bin/pandora_exec
+if [ -e /usr/bin/pandora_exec.server ]
+then
+	ln -s /usr/bin/pandora_exec.server /usr/bin/pandora_exec 2> /dev/null
+fi
\ No newline at end of file
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index baa047f8b9..9d31299e4c 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,4 +1,4 @@
-2010-11-  Miguel de Dios  <miguel.dedios@artica.es>
+2010-11-10  Miguel de Dios  <miguel.dedios@artica.es>
 	
 	* DEBIAN/postinst, DEBIAN/prerm, DEBIAN/make_deb_package.sh: fixed the use
 	pandora_exec for Pandora Server and Pandora Agent, now make a