diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
new file mode 100644
index 0000000..e2059dc
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -0,0 +1,2 @@
+DIST teamspeak3-server_linux-amd64-3.0.6.1.tar.gz 4131518 SHA256 5d222d1f6b28db856788e0004a1a2143372c82fecbd0651e8a575cee8742ef3c SHA512 e5700fea5bf4df2134449cf3a57a823feb4bf72e052bec242fe4d180563a44cf48acd3d46f3ac2ec1a9c300ab903ff132cb16e06501cbac4650993240656414b WHIRLPOOL 4ba2a6f4561365c1441c7bec861b057e8d66d5ea9f08f05e472c2ed70ceedec5898b149e9cb208d0cdea7ccccde97acda0de9e412c5e86cc8a25ff3a25b12ee2
+DIST teamspeak3-server_linux-x86-3.0.6.1.tar.gz 4436951 SHA256 ea0399bfce623b09e15dca4fc970528ae7b4cee27027ff2ab03a1563da562f0c SHA512 5e022bcb8b3c0b8c728c2ea85421908c86f9e41ea87c172a246fd749b04182467cfdaba8d53413b76c6dbbf97d598564e533245f2530f6375c5cd35465c2f850 WHIRLPOOL a4fa70b534bd3370cda50de7f462126db2d0a34bbe4fa5fcae3c226d277f03bc30d8af09d3909c79f005decc68b5f8c15517fc9e7a485d8c9807ca83082402d1
diff --git a/media-sound/teamspeak-server-bin/files/server.conf b/media-sound/teamspeak-server-bin/files/server.conf
new file mode 100644
index 0000000..0fd2db6
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/server.conf
@@ -0,0 +1,14 @@
+machine_id=
+default_voice_port=9987
+voice_ip=0.0.0.0
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=0.0.0.0
+query_port=10011
+query_ip=0.0.0.0
+dbplugin=ts3db_sqlite3
+dbpluginparameter=
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_sqlite/
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
new file mode 100644
index 0000000..c83afe3
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
@@ -0,0 +1,4 @@
+# systemd tmpfile settings for teamspeak3-server
+# See tmpfiles.d(5) for details
+
+d /var/run/teamspeak3 0755 teamspeak3 teamspeak3 -
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.service
new file mode 100644
index 0000000..11213cc
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=TeamSpeak 3 Server
+After=network.target
+
+[Service]
+Type=simple
+Environment=LD_LIBRARY_PATH=/opt/teamspeak3-server
+WorkingDirectory=/opt/teamspeak3-server
+ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+ExecStart=/opt/teamspeak3-server/ts3server-bin inifile=/etc/teamspeak3-server/server.conf
+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/teamspeak3-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
new file mode 100644
index 0000000..0f1e229
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.5 2012/05/10 20:14:34 trapni Exp $
+
+depend() {
+	need net
+	use mysql
+}
+
+start() {
+	ebegin "Starting TeamSpeak 3 Server"
+
+	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
+	export LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
+
+	start-stop-daemon --start --quiet --background \
+		--pidfile "/var/run/teamspeak3-server/server.pid" --make-pidfile \
+		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
+		--exec "/usr/sbin/ts3server" -- \
+		inifile="/etc/teamspeak3-server/server.conf"
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping TeamSpeak 3 Server"
+
+	start-stop-daemon --stop --quiet \
+		--pidfile "/var/run/teamspeak3-server/server.pid"
+
+	eend $?
+}
+
+restart() {
+	svc_stop
+	sleep 3
+	svc_start
+}
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc b/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc
new file mode 100644
index 0000000..9705f68
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak3-tsdns-server.rc
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/files/teamspeak3-server.rc,v 1.4 2010/09/11 16:01:50 trapni Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting TeamSpeak 3 TSDNS Server"
+
+	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"
+
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping TeamSpeak 3 TSDNS Server"
+
+	start-stop-daemon --stop --quiet \
+		--pidfile "/var/run/teamspeak3-server/tsdns.pid"
+
+	eend $?
+}
+
+restart() {
+	svc_stop
+	sleep 3
+	svc_start
+}
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
new file mode 100644
index 0000000..2b2e1c3
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server
@@ -0,0 +1,10 @@
+#! /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}/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
new file mode 100644
index 0000000..f6f6bde
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.5-r2.ebuild,v 1.2 2012/06/09 23:22:53 zmedico Exp $
+
+EAPI=4
+
+inherit eutils systemd user
+
+DESCRIPTION="TeamSpeak Server - Voice Communication Software"
+HOMEPAGE="http://teamspeak.com/"
+LICENSE="teamspeak3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )
+"
+
+S="${WORKDIR}/teamspeak3-server_linux-${ARCH}"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewuser teamspeak3
+}
+
+src_install() {
+	local dest="${D}/opt/teamspeak3-server"
+
+	mkdir -p "${dest}"
+	cp -R "${WORKDIR}/teamspeak3-server_linux-"*/* "${dest}/" || die
+
+	mv "${dest}/ts3server_linux_"* "${dest}/ts3server-bin" || die
+	mv "${dest}/tsdns/tsdnsserver_linux_"* "${dest}/tsdns/tsdnsserver" || die
+
+	exeinto /usr/sbin || die
+	doexe "${FILESDIR}/ts3server" || die
+
+	# runtime FS layout ...
+	insinto /etc/teamspeak3-server
+	doins "${FILESDIR}/server.conf"
+	newins "${dest}/tsdns/tsdns_settings.ini.sample" tsdns_settings.ini
+	dosym "${D}"/etc/teamspeak3-server/tsdns_settings.ini /opt/teamspeak3-server/tsdns/tsdns_settings.ini
+	newinitd "${FILESDIR}/teamspeak3-server.rc" teamspeak3-server
+	newinitd "${FILESDIR}/teamspeak3-tsdns-server.rc" teamspeak3-tsdns-server
+
+	keepdir /{etc,var/{lib,log,run}}/teamspeak3-server
+	fowners teamspeak3 /{etc,var/{lib,log,run}}/teamspeak3-server
+	fperms 700 /{etc,var/{lib,log,run}}/teamspeak3-server
+
+	fowners teamspeak3 /opt/teamspeak3-server
+	fperms 755 /opt/teamspeak3-server
+
+	systemd_dounit "${FILESDIR}/systemd/teamspeak3.service"
+	systemd_dotmpfilesd "${FILESDIR}/systemd/teamspeak3.conf"
+}