diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
index ad42481..9ecc238 100644
--- a/media-sound/teamspeak-client-bin/Manifest
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -1,9 +1,12 @@
 AUX teamspeak3 258 SHA256 42a5e2a879af2b1f539240a75315f4ff65fdf20d90d8c3984f234ba5cf9869f3 SHA512 b587b3991e927922854f155ac61e8d923a6b84a1da88a040277d670203be7dc11b5fbf79508d3894e94a2686da1758781b158c7598c8a61b151798c6a7b1880e WHIRLPOOL 8c542bed81d5f04418b30a39ac63eb4a43f2ab9d339d7f197fd78e674e7908c8696b78c04fd5400916b30c849868adb948c79748f0ba8d1052d507fb6a9c6d3a
 DIST TeamSpeak3-Client-linux_amd64-3.0.13.1.run 33207717 SHA256 211aa921c73369e074e59aa4b664c9d288f98a5f1172f9f8b006a46df5dd4856 SHA512 3d5fc5b419cfd683a0c7787f3ec4b6df14bd944db85eb0abffdbc2b14e5c913cbf77353b46cf81c89f8a34127d362f1312c3e7d6a21b9087b78a171ce0349d9c WHIRLPOOL d2ca0eb74ea5393941dc0613c5ff8462bbae484d61a8d1e2a3e7a04905e777d328e34e073c7a2394d0be6385c92e386d74617c39f7ab6fcb47b13ba5201538c0
 DIST TeamSpeak3-Client-linux_amd64-3.0.16.run 35784109 SHA256 62034baddf352dd2fea615f0aac9a6df7eae363bb3ed7cad78c1fb996b86773f SHA512 a65d986fe4860caf1bba8217fcf429fe4571867439e734e5838893e31167fa1f134c4cabbd3ef80d744f22298172d87496e4f025f51fd7c275781a3bc2c56838 WHIRLPOOL bf3bd39f93aa08b625e659d2cdd5ab857e0f940a344f5535f2941cce367a57b5191b61f18c7b5e63c3b051dac57ebb8c3df739ebc0fec1a721e863afc1e833c2
+DIST TeamSpeak3-Client-linux_amd64-3.0.17.run 42685092 SHA256 22a427c2cb42087979f559a6c36c873857087fff1a1c8a48688b2e17dc967f7e SHA512 4869aa109e984cde53a0a1faef6fdaff82fdac237119cb69df7bdf06f5fdf878143c62d39b098f1b85277f370702fa37a307a24961462f05750a2d1df2b674b1 WHIRLPOOL ec9bf82cec4a51dc0ddaee16ee55c354216977db441f9526b2127406fbc992ae39c4ce3dd85fa0acbe80ee87218e7b241d21bb7feb8aa79ec7d2528ed3e03c7d
 DIST TeamSpeak3-Client-linux_x86-3.0.13.1.run 33947497 SHA256 0162f1cef570acde7245fb62c3ed52aa606234375a14d0bcce35500b183d9cc2 SHA512 32af801f73de876e667f31b8046baf9df6498a1ad6f71de2ca33257ee685abc80f200750e4c8e6cb5931635d31f261de9cb409f930c1e99e42be5f9543dbf062 WHIRLPOOL 69964e6b757f77c9ba87b3efa19b55ced5aa60a0ee50af3011426682832d307e4eb79554d8928f5647556258d40808eb5259d3606c7b2df27dcdb95c19078482
 DIST TeamSpeak3-Client-linux_x86-3.0.16.run 36484150 SHA256 3fb21e9b428c0b535c90b0a191bcf1baae29bf99be7cf4621b9da276dd5e76ac SHA512 67b1da2769b1a34cd1affc3e36c1d74d7225711666e1c6d0ededbc4c0dc94d52b9d07181ea89db4d8ec09e58f9e61081f981663338ed7d7ec8efac3719f4b0ad WHIRLPOOL 9c2d51ae9d5a77b833ce7ee400cc611df6727e4793de51d6c95fa8e864d5f17bfe2272ac451751250333ac567bb5b3d4366184113f0d74545ed36088dc2bf438
+DIST TeamSpeak3-Client-linux_x86-3.0.17.run 43059396 SHA256 22e14cad852b4ac84189c63fc3899fec9224e658f77b8613e854419502e366dd SHA512 344d903f5963bc079a95b567267c253ec66179033a86192a89895747dba39e39283f41640e19a0a5546e854ea5252b557508963634483fa8f807b06d6697f0fe WHIRLPOOL a1bac380052950dc2b798f7febf3a565fd3ff993f6465765f42a16d7efe2254231e4d612f8e3680157df2dd8c74df21fa5a411e9aec89dd8955585838cce4dd8
 EBUILD teamspeak-client-bin-3.0.13.1.ebuild 1747 SHA256 a7328a5353453ad809e36130b00426f9489f781ca8521c7a569e010805d227df SHA512 2218570711e52c6ee0ceec5dcf5132f2e1f14ed60cd723fa11dc31738a33a27208ebc86785888cdfed9ac2e10cb35b42a6f13bd5c74ba6839ecaa7d2efd7ca97 WHIRLPOOL 561b953a7f05a00077d1481a70b20c17b7b9cdcb9bb6fb31a23c7bddfadc71a399317c75f9b3f37255557cbd4b910bacb255bd0a79327d15c4bad4d0f6e25d86
 EBUILD teamspeak-client-bin-3.0.16-r1.ebuild 1945 SHA256 55cbd41f1154b4c0540b91220e4d614ad278c20c518a1666ac28642d8461cc53 SHA512 248d54dec9738fa199233afae61632c3a8f804e691f33f0b8c7c777dbfd658f17eb343a06cb218c7267f5d40d90d88089b59014a9e4fa336eac001226a467b37 WHIRLPOOL b7c88773ce0e2399c047fc810bed374fa6c3228e3bb81ad3d5fbd3adca8768281892eb5b15c2b0c9c9958d7703627322ab89b50e5d17a718e0a3b2de3b3485d1
+EBUILD teamspeak-client-bin-3.0.17.ebuild 1933 SHA256 5c84ff129379471aafc52d221049182c2e18209268e5e68f7592bb8b6085a88d SHA512 0edbf2fcc1fdc73599943afd8f2fe765acd0d95fddd0a2ca51912a2a140fd64f805f2be098c1d08296579cdfe0711bee24a434e4deb5e949da66241cf40c3e8a WHIRLPOOL 33ac11f9abdcf93602f1c01281f74eb3be848e10f2ca942e1ace5ae3534949cb8f38549e12e0ff09d935572d994cbd22ef30766249fceb3a1b8bcb91aef3e797
 MISC ChangeLog 9115 SHA256 94c44f852c9f8e6e58c52b85cbea614bff3e2e4635dc2829605f7c57a5fbd246 SHA512 7e796ece90503c705c0bc3d7c0e3edc0b8359c4cca0f7e16b2690500adf24bff47c6167e35b65492694348033e584fe92813a7258809d9865afe5b5269a60fc8 WHIRLPOOL 3bff28dbea9d980f850454be28ae99175685bf4073a2bd0e2dc2660febc2aff4cc9ecb4d8601835c5845d9feee7f9ba7524afa4fef9f72a2ea7f6a8d7b643a61
 MISC metadata.xml 427 SHA256 da4fcc41e5e75155a236b870ba52cb1d4ab0b2246c12dbd0255a55cffba47ab1 SHA512 a1fb55fcc26beb9b5fd63e148deb7806827babc8c6123d9f35201a8813575f8ecef27a89c57151b7e7d74ea9bdadf059f1d9ea7fbbb62888e905ec3fd9cf022d WHIRLPOOL aec3302ecd40ab2bc27668d9e01149e9b7388b5caf0bb7eff1de54286b52d9978851bde8551fd680fe3ba67398b1aa8bf1829c53dfebfccbe9e6d60b5b2d8710
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.17.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.17.ebuild
new file mode 100644
index 0000000..8beddce
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.17.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils unpacker
+
+DESCRIPTION="TeamSpeak Client - Voice Communication Software"
+HOMEPAGE="http://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+
+LICENSE="teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	dev-libs/quazip:0/0[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	sys-libs/glibc
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="fetch mirror strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}?page=downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+src_prepare() {
+	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
+	rm libQt* || die "Couldn't remove bundled Qt libraries."
+
+	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
+
+	# Remove unwanted soundbackends.
+	if ! use alsa ; then
+		rm soundbackends/libalsa* || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm soundbackends/libpulseaudio* || die
+	fi
+
+	# Remove quazip
+	rm libquazip.so || die
+
+	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
+	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
+}
+
+src_install() {
+	insinto /opt/teamspeak3-client
+	doins -r *
+
+	fperms +x /opt/teamspeak3-client/ts3client
+
+	dobin "${FILESDIR}/teamspeak3"
+
+	make_desktop_entry teamspeak3 TeamSpeak3 \
+		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
+		Network
+}