diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-tsdns-server.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-tsdns-server.service
new file mode 100644
index 0000000..9d5b3cb
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-tsdns-server.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=TeamSpeak 3 TSDNS Server
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/opt/teamspeak3-server
+ExecStart=/opt/teamspeak3-server/sbin/tsdnsserver
+ExecStop=/bin/kill -15 $MAINPID
+StandardOutput=syslog
+StandardError=syslog
+User=teamspeak3
+Group=teamspeak3
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
+# vim:syntax=dosini
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc
index 81b8695..161cebd 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.2.rc,v 1.1 2013/05/22 11:22:59 tomwij Exp $
+# $Header: $
 
 depend() {
 	need net
@@ -31,7 +31,7 @@ start() {
 }
 
 stop() {
-	ebegin "Stopping TeamSpeak Server"
+	ebegin "Stopping TeamSpeak 3 Server"
 
 	start-stop-daemon --stop --quiet \
 		--pidfile "/var/run/teamspeak3-server/server.pid"
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 27940da..8188924 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-tsdns-server.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-3.0.7.1.rc,v 1.1 2013/04/25 18:11:05 tomwij Exp $
+# $Header: $
 
 depend() {
 	need net
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild
index 9a2340f..23465ae 100644
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.10.3.ebuild
@@ -74,13 +74,14 @@ src_install() {
 	# Install the runtime FS layout.
 	insinto /etc/teamspeak3-server
 	doins "${FILESDIR}"/server.conf
-	doins "${FILESDIR}"/ts3db_mysql.ini
+	use mysql && doins "${FILESDIR}"/ts3db_mysql.ini
 	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
 
 	# Install the init script and systemd unit.
 	newinitd "${FILESDIR}"/${PN}.rc teamspeak3-server
 	use tsdns && newinitd "${FILESDIR}/teamspeak-tsdns-server.rc" teamspeak3-tsdns-server
 	systemd_dounit "${FILESDIR}"/systemd/teamspeak3.service
+	use tsdns && systemd_dounit "${FILESDIR}"/systemd/teamspeak3-tsdns-server.service
 	systemd_dotmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf
 
 	# Fix up permissions.