diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 6d20695550..4a0a8713f4 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-08  Sancho Lerena <slerena@gmail.com>
+
+	* pandora_server_installer: Fixed problems on linux due
+	bad link paths from /usr/local/bin -> /usr/bin
+
 2014-09-06 Junichi Satoh <junichi@rworks.jp>
 
 	* lib/PandoraFMS/Core.pm: Fixed that unknown modules are never
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5e2b4e3daa..620712cbb3 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -247,8 +247,9 @@ perl-TimeDate perl-XML-Simple perl-XML-Twig perl-libwww-perl mysql-client"
 		fi
 		if [ "$DISTRO" != "FreeBSD" ] && [ "$DISTRO" != "NetBSD" ]
 		then
-			ln -s /usr/local/bin/pandora_server $DESTDIR$PREFIX
-			ln -s /usr/local/bin/pandora_exec $DESTDIR$PREFIX
+			ln -s /usr/local/bin/pandora_server $DESTDIR$PREFIX/bin
+			ln -s /usr/local/bin/pandora_exec $DESTDIR$PREFIX/bin
+			ln -s /usr/local/bin/tentacle_server $DESTDIR$PREFIX/bin
 		fi
 	fi