diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc
index abeecbd..9d18503 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc
@@ -13,7 +13,7 @@ start() {
 	start-stop-daemon --start --quiet --background \
 		--pidfile "/var/run/teamspeak3-server/tsdns.pid" --make-pidfile \
 		--user "teamspeak3" --chdir "/opt/teamspeak3-server/tsdns" \
-		--exec "/opt/teamspeak3-server/tsdns/tsdnsserver"
+		--exec "/opt/teamspeak3-server/tsdns/tsdnsserver_linux"
 
 	eend $?
 }
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild
index a149989..03c8952 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.7.1.ebuild
@@ -46,6 +46,12 @@ src_install() {
 	exeinto /usr/sbin
 	doexe "${FILESDIR}/ts3server"
 
+	# Symlink tsdns somewhere useful
+	if use amd64 ; then
+		dosym "${D}"/opt/teamspeak3-server/tsdns/tsdnsserver_linux /opt/teamspeak3-server/tsdns/tsdnsserver_linux_amd64
+	elif use x86 ; then
+		dosym "${D}"/opt/teamspeak3-server/tsdns/tsdnsserver_linux /opt/teamspeak3-server/tsdns/tsdnsserver_linux_x86
+	fi
 	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
 	doins "${FILESDIR}/server.conf"