diff --git a/srcpkgs/teamspeak3/files/teamspeak3 b/srcpkgs/teamspeak3/files/teamspeak3
new file mode 100644
index 0000000000..a4240467b5
--- /dev/null
+++ b/srcpkgs/teamspeak3/files/teamspeak3
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/share/teamspeak3/ts3client_runscript.sh $@
diff --git a/srcpkgs/teamspeak3/files/teamspeak3.desktop b/srcpkgs/teamspeak3/files/teamspeak3.desktop
new file mode 100644
index 0000000000..98c53d4006
--- /dev/null
+++ b/srcpkgs/teamspeak3/files/teamspeak3.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=TeamSpeak 3
+GenericName=TeamSpeak
+Comment=TeamSpeak is software for quality voice communication via the Internet
+Exec=teamspeak3
+Icon=teamspeak3
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Network;Chat
+Keywords=VoIP;Messaging;Voice Chat;
diff --git a/srcpkgs/teamspeak3/template b/srcpkgs/teamspeak3/template
new file mode 100644
index 0000000000..846f5ec43a
--- /dev/null
+++ b/srcpkgs/teamspeak3/template
@@ -0,0 +1,54 @@
+# Template file for 'teamspeak3'
+pkgname=teamspeak3
+version=3.1.4
+revision=1
+wrksrc=teamspeak3
+repository="nonfree"
+nopie=yes
+restricted=yes
+create_wrksrc=yes
+short_desc="Popular proprietary voice chat for gaming"
+maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
+license="Proprietary"
+homepage="http://www.teamspeak.com/"
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	_pkg="TeamSpeak3-Client-linux_amd64-${version}"
+	distfiles="http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/${_pkg}.run"
+	checksum=337aec99070366aa3bb82b1bedd8215372b9c74014b198d45d5d6375d1f1c3a8
+elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	_pkg="TeamSpeak3-Client-linux_x86-${version}"
+	distfiles="http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/${_pkg}.run"
+	checksum=4e126e005b1180655b0847cbdbfc9c47c59c639b7f93f0d988b54a8c4c6ec80f
+else
+	broken="No known upstream client for this architecture"
+fi
+
+do_extract() {
+	install -m755 ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_pkg}.run ${wrksrc}
+	cd ${wrksrc}
+	sh ./${_pkg}.run --tar -xf 2>/dev/null
+	rm -f ${_pkg}.run
+}
+
+do_install() {
+	# Set proper permissions
+	find -type d | xargs chmod 755
+	find -type f | xargs chmod 644
+	find -name *.so | xargs chmod 755
+	chmod +x ts3client*
+
+	vmkdir "usr/share/teamspeak3"
+	vcopy * "usr/share/teamspeak3"
+
+	# Install desktop file
+	vinstall "${FILESDIR}/teamspeak3.desktop" 644 "usr/share/applications"
+
+	# Install icon file
+	vinstall styles/default/logo-128x128.png 644 usr/share/pixmaps/teamspeak3.png
+
+	# Install the license (not present in most recent version)
+	# vlicense LICENSE
+
+	# Install client launcher
+	vbin "${FILESDIR}/teamspeak3"
+}
diff --git a/srcpkgs/teamspeak3/update b/srcpkgs/teamspeak3/update
new file mode 100644
index 0000000000..ed8692a4cf
--- /dev/null
+++ b/srcpkgs/teamspeak3/update
@@ -0,0 +1,2 @@
+site="https://www.teamspeak.com/downloads"
+pattern="releases/\K[0-9.]+(?=/)"