diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index dbd631dc57..973cf3f121 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -262,6 +262,7 @@ install () {
 				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
+				ln -s /usr/local/bin/tentacle_client $DESTDIR$PREFIX/bin
 			fi
 		fi
 	fi
@@ -495,7 +496,9 @@ uninstall () {
 	rm -f  $DESTDIR$PANDORA_SERVER 2> /dev/null 
 	rm -f  $DESTDIR$PREFIX/bin/pandora_server 2> /dev/null
 	rm -f  $DESTDIR$PREFIX/bin/pandora_exec 2> /dev/null
-	rm -f  $DESTDIR$PREFIX/bin/tentacle_server 2> /dev/null
+	# Do not remove tentacle files if agent is still installed...
+	[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f  $DESTDIR$PREFIX/bin/tentacle_server 2> /dev/null
+	[ -e $DESTDIR$PREFIX/bin/pandora_agent ] || rm -f  $DESTDIR$PREFIX/bin/tentacle_client 2> /dev/null
 	rm -Rf $DESTDIR$PANDORA_HOME
 	rm -f  $DESTDIR/etc/cron.hourly/pandora_db
 	rm -f  $DESTDIR/etc/logrotate.d/pandora_server