diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc
index 292878f..27940da 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc
@@ -12,8 +12,8 @@ start() {
 
 	start-stop-daemon --start --quiet --background \
 		--pidfile "/var/run/teamspeak3-server/tsdns.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/usr/sbin/tsdnsserver"
+		--user "teamspeak3" --chdir "/etc/teamspeak3-server" \
+		--exec "/opt/teamspeak3-server/sbin/tsdnsserver"
 
 	eend $?
 }
diff --git a/media-sound/teamspeak-server-bin/files/tsdnsserver b/media-sound/teamspeak-server-bin/files/tsdnsserver
deleted file mode 100644
index 03cfdde..0000000
--- a/media-sound/teamspeak-server-bin/files/tsdnsserver
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-BASEDIR="/opt/teamspeak3-server"
-
-export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-
-# work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
-cd "${BASEDIR}"
-
-exec "${BASEDIR}/sbin/tsdnsserver" $*
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild
index 32f71c7..233bef8 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.9.ebuild
@@ -46,7 +46,6 @@ src_install() {
 
 	exeinto /usr/sbin
 	doexe "${FILESDIR}"/ts3server
-	use tsdns && doexe "${FILESDIR}"/tsdnsserver
 
 	exeinto ${opt_dir}
 	doexe *.sh
@@ -66,6 +65,8 @@ src_install() {
 		newdoc tsdns/README README.tsdns
 		newdoc tsdns/USAGE USAGE.tsdns
 		dodoc tsdns/tsdns_settings.ini.sample
+		insinto /etc/teamspeak3-server
+		newins tsdns/tsdns_settings.ini.sample tsdns_settings.ini
 	fi
 
 	# Install the runtime FS layout.