diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
index d68b117..afc2eec 100644
--- a/media-sound/teamspeak-server-bin/Manifest
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -1,2 +1,2 @@
-DIST teamspeak3-server_linux_amd64-3.0.13.8.tar.bz2 6916065 SHA256 460c771bf58c9a49b4be2c677652f21896b98a021d7fff286e59679b3f987a59 SHA512 d8985f5850602660a6c037c1768a97c79b5842640d618ad00d242035a12820b52ba959545f3e668eb3d6079b1a228ff648c569e7d1fc64be6743ee77995ab0be WHIRLPOOL a9863eb89200b7de89775112ccf8d47f5dad08b6c06f39cbac1d09810c45dbeebd08265982e9e2b0ceea6bc9eb616b86e6cc632533a41591e391b7338c2672a2
-DIST teamspeak3-server_linux_x86-3.0.13.8.tar.bz2 6772664 SHA256 c1be39df7ee136c87e0ea1eff4e3aa84074e2d141c66d23f9a66eb5afa2b1876 SHA512 7ef5d5d0fa2a1244011c2a68662481e4859aa1660e967b203a508497a4fd3c54db44a9f33116ed4932745942df4b5e4c646658346f288ce6191e3e5629d9638f WHIRLPOOL 6246446439b676f69e56168df445c6f7b6956212e0330e4b541a84c1a2e3466273f60b26298bf7c41b0f8157d1b70c165a2e5a9feb96b3d9651463073adbca46
+DIST teamspeak3-server_linux_amd64-3.1.1.tar.bz2 7798155 BLAKE2B 4962968b33eaaa07043cfaa23d020d3d7dcff19b9e380f797196d382a4d004fb0ca2a56246eedf246f796e1bea8f719e80e715b2eda67e5340b7042dd1111a57 SHA512 8561cbeb16a44889ddaa6ab054b47abaaa6a5c942f39c308f6afd2687110bc9e142a8711afe557fa22fe92d1395b844a0eff8c8043921aee4e8070571bee6e44
+DIST teamspeak3-server_linux_x86-3.1.1.tar.bz2 7658201 BLAKE2B 1625200a625ad7615241341846e992de8567c7fa7f6fbeb5234953ab696d60809591f870157e947b06953cb421019c7d0cf920bd0ba65968c4178284b0154206 SHA512 952e2e5d467f68b6f5f0bfc0e4f5a71917c2c14809aeccc64038679e6fd7a20f0794e0662f7a2fec1827a5a99249d1df3a673fb53e324524b4320c64083608c6
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
deleted file mode 100644
index 435325b..0000000
--- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[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/sbin/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/teamspeak-server-bin-init-r1 b/media-sound/teamspeak-server-bin/files/teamspeak.initd
similarity index 56%
rename from media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
rename to media-sound/teamspeak-server-bin/files/teamspeak.initd
index 1259241..cc8393b 100644
--- a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.initd
@@ -1,12 +1,14 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-name="TeamSpeak Server"
-command="/usr/sbin/ts3server"
-pidfile="/run/teamspeak3-server/server.pid"
+command="/opt/bin/ts3server"
 command_background="true"
+group="teamspeak"
+inifile="/etc/teamspeak3-server/ts3server.ini"
+name="TeamSpeak Server"
+pidfile="/run/teamspeak3-server/server.pid"
+user="teamspeak"
 
 depend() {
 	need net
@@ -21,17 +23,17 @@ start_pre() {
 	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
 	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
 
-	checkpath -d --owner teamspeak3:teamspeak3 --mode 0700 /run/teamspeak3-server
+	checkpath -d --owner ${user}:${group} --mode 0700 /run/teamspeak3-server
 }
 
 start() {
 	ebegin "Starting ${name}"
 
-	start-stop-daemon --start --quiet --background \
-		--pidfile "/run/teamspeak3-server/server.pid" --make-pidfile \
-		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
-		--exec "/usr/sbin/ts3server" -- \
-		inifile="/etc/teamspeak3-server/server.conf"
+	start-stop-daemon --start --quiet --background --env "TS3SERVER_LICENSE=accept" \
+		--pidfile "${pidfile}" --make-pidfile \
+		--user "${user}" --group "${group}" --chdir "/opt/teamspeak3-server" \
+		--exec "${command}" -- \
+		inifile="${inifile}"
 
 	eend $?
 }
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak.service b/media-sound/teamspeak-server-bin/files/teamspeak.service
new file mode 100644
index 0000000..0c77e4c
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=TeamSpeak3 Server
+After=network-online.target
+
+[Service]
+Type=simple
+User=teamspeak
+Group=teamspeak
+WorkingDirectory=/opt/teamspeak3-server
+Environment="LD_LIBRARY_PATH=/opt/teamspeak3-server"
+Environment="TS3SERVER_LICENSE=accept"
+ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+ExecStart=/opt/bin/ts3server inifile=/etc/teamspeak3-server/ts3server.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf b/media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
similarity index 58%
rename from media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
rename to media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
index 8496c1e..1b1d7f0 100644
--- a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
+++ b/media-sound/teamspeak-server-bin/files/teamspeak.tmpfiles
@@ -1,4 +1,4 @@
 # systemd tmpfile settings for teamspeak3-server
 # See tmpfiles.d(5) for details
 
-d /var/run/teamspeak3-server 0755 teamspeak3 teamspeak3 -
+d /var/run/teamspeak3 0755 teamspeak teamspeak -
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
similarity index 91%
rename from media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
rename to media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
index 7cdc6d6..0a8ebc4 100644
--- a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini.sample
@@ -4,4 +4,4 @@ port=3306
 username=teamspeak
 password=teamspeak
 database=teamspeak
-socket=
\ No newline at end of file
+socket=
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
deleted file mode 100644
index 261b471..0000000
--- a/media-sound/teamspeak-server-bin/files/ts3server
+++ /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/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/files/ts3server-bin b/media-sound/teamspeak-server-bin/files/ts3server-bin
new file mode 100644
index 0000000..3deb9dd
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server-bin
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Sets BASEDIR for teamspeak3-server
+BASEDIR="/opt/teamspeak3-server"
+
+# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+
+# Launch teamspeak3-server
+cd "${BASEDIR}" && exec "${BASEDIR}/ts3server" $*
diff --git a/media-sound/teamspeak-server-bin/files/server.conf b/media-sound/teamspeak-server-bin/files/ts3server.ini
similarity index 90%
rename from media-sound/teamspeak-server-bin/files/server.conf
rename to media-sound/teamspeak-server-bin/files/ts3server.ini
index 6ae7949..962c8b8 100644
--- a/media-sound/teamspeak-server-bin/files/server.conf
+++ b/media-sound/teamspeak-server-bin/files/ts3server.ini
@@ -18,3 +18,6 @@ logquerycommands=0
 dbclientkeepdays=30
 logappend=0
 query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
diff --git a/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample b/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample
new file mode 100644
index 0000000..94cea8b
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server_mariadb.ini.sample
@@ -0,0 +1,23 @@
+machine_id=
+default_voice_port=9987
+voice_ip=
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=
+query_port=10011
+query_ip=0.0.0.0, ::
+query_ip_whitelist=query_ip_whitelist.txt
+query_ip_blacklist=query_ip_blacklist.txt
+dbplugin=ts3db_mariadb
+dbpluginparameter=ts3db_mariadb.ini
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_mariadb/
+dbconnections=10
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
+dbclientkeepdays=30
+logappend=0
+query_skipbruteforcecheck=0
+query_buffer_mb=20
+http_proxy=
+license_accepted=1
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
deleted file mode 100644
index 445c546..0000000
--- a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib systemd user versionator
-
-MY_PV="$(get_version_component_range 1-4)-Beta-$(get_version_component_range 5)"
-
-DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
-HOMEPAGE="https://www.teamspeak.com/"
-if [[ ${PV} != "*_beta*" ]] ; then
-	SRC_URI="
-			amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
-			x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
-else
-	SRC_URI="
-			amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_amd64-${MY_PV}.tar.bz2 )
-			x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_x86-${MY_PV}.tar.bz2 )"
-fi
-
-SLOT="0"
-LICENSE="teamspeak3 GPL-2"
-IUSE="doc mysql tsdns"
-KEYWORDS="~amd64 ~x86"
-DEPEND="mysql? ( >=virtual/mysql-5.5 )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="installsources mirror strip"
-
-S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
-
-QA_PREBUILT="opt/*"
-
-pkg_nofetch() {
-	elog "Please download ${A}"
-	elog "from ${HOMEPAGE}downloads and place this"
-	elog "file in ${DISTDIR}"
-}
-
-pkg_setup() {
-	enewuser teamspeak3
-}
-
-src_install() {
-	# Install wrapper
-	dosbin "${FILESDIR}"/ts3server
-
-	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
-	local opt_dir="/opt/teamspeak3-server"
-	into ${opt_dir}
-	insinto ${opt_dir}
-	exeinto ${opt_dir}
-	newsbin ts3server ts3server-bin
-	doexe *.sh
-	doins *.so
-	# 'libmariadb.so.2' is hard-coded into the ts3-server binary :(
-	use mysql && doexe redist/libmariadb.so.2
-	doins -r sql
-
-	# Install documentation and tsdns.
-	dodoc -r CHANGELOG doc/*.txt
-	use doc && dodoc -r serverquerydocs doc/serverquery && \
-		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
-		docompress -x /usr/share/doc/${PF}/serverquery && \
-		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
-		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
-
-	if use tsdns; then
-		newsbin tsdns/tsdnsserver tsdnsserver
-		newdoc tsdns/README README.tsdns
-		newdoc tsdns/USAGE USAGE.tsdns
-		dodoc tsdns/tsdns_settings.ini.sample
-	fi
-
-	# Install the runtime FS layout.
-	insinto /etc/teamspeak3-server
-	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
-	keepdir /{etc,var/{lib,log}}/teamspeak3-server
-
-	# Install the init script and systemd unit.
-	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
-	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
-	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
-
-	# Fix up permissions.
-	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
-	fowners teamspeak3 ${opt_dir}
-
-	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
-	fperms 755 ${opt_dir}
-}
-
-pkg_postinst() {
-	einfo "Starting with version 3.0.13, there are two important changes:"
-	einfo "- IPv6 is now supported."
-	einfo "- Binding to any address (0.0.0.0 / 0::0),"
-	einfo "  instead of just the default ip of the network interface."
-}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
new file mode 100644
index 0000000..15d977a
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.1.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver eutils systemd user
+
+MY_PV="$(ver_cut 1-4)-Beta-$(ver_cut 5)"
+
+DESCRIPTION="TeamSpeak is software for quality voice communication via the Internet"
+HOMEPAGE="https://www.teamspeak.com/"
+if [[ ${PV} != "*_beta*" ]] ; then
+	SRC_URI="
+			amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+			x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+else
+	SRC_URI="
+			amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_amd64-${MY_PV}.tar.bz2 )
+			x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/pre_releases/server/${MY_PV}/teamspeak3-server_linux_x86-${MY_PV}.tar.bz2 )"
+fi
+
+LICENSE="LGPL-2.1 teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc tsdns"
+# IUSE="doc mysql tsdns"
+
+# RDEPEND="mysql? ( dev-db/mariadb-connector-c:0=
+#		<dev-libs/openssl-1.1:0=
+#		sys-libs/zlib )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}/teamspeak3-server_linux"
+
+QA_PREBUILT="opt/teamspeak3-server/libts3db_sqlite3.so
+		opt/teamspeak3-server/ts3server"
+
+pkg_setup() {
+	enewgroup teamspeak
+	enewuser teamspeak -1 -1 /opt/teamspeak3-server teamspeak
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64; then
+		mv "teamspeak3-server_linux_amd64" "teamspeak3-server_linux" || die
+	else
+		mv "teamspeak3-server_linux_x86" "teamspeak3-server_linux" || die
+	fi
+}
+
+src_install() {
+	# Accept license
+	touch "${T%/}"/.ts3server_license_accepted || die
+	insinto "/opt/teamspeak3-server"
+	doins "${T}"/.ts3server_license_accepted
+
+	# Install binary and wrapper
+	exeinto "/opt/teamspeak3-server"
+	doexe "ts3server"
+	doexe "${FILESDIR}/ts3server-bin"
+	dodir "/opt/bin"
+	dosym "../teamspeak3-server/ts3server-bin" "/opt/bin/ts3server"
+
+	# Install libs
+	exeinto "/opt/teamspeak3-server"
+	doexe "libts3db_sqlite3.so"
+
+	# Install sql
+	insinto "/opt/teamspeak3-server/sql"
+	doins "sql"/*.sql
+	doins -r "sql/create_sqlite"
+
+	# Install config
+	insinto "/etc/teamspeak3-server"
+	doins "${FILESDIR}/ts3server.ini"
+
+	# Install init script and systemd unit
+	newinitd "${FILESDIR}/teamspeak.initd" teamspeak3-server
+	systemd_newunit "${FILESDIR}/teamspeak.service" teamspeak3-server.service
+	systemd_newtmpfilesd "${FILESDIR}/teamspeak.tmpfiles" teamspeak3-server.conf
+
+	# Install optional mysql
+	# if use mysql; then
+	#	insinto "/etc/teamspeak3-server"
+	#	doins "${FILESDIR}/ts3server_mariadb.ini.sample"
+	#	doins "${FILESDIR}/ts3db_mariadb.ini.sample"
+	#
+	#	exeinto "/opt/teamspeak3-server"
+	#	doexe "libts3db_mariadb.so"
+	#
+	#	insinto "/opt/teamspeak3-server/sql"
+	#	doins -r "sql/create_mariadb"
+	#	doins -r "sql/updates_and_fixes"
+	# fi
+
+	# Install optional docs
+	if use doc; then
+		local HTML_DOCS=( "doc/serverquery/." )
+
+		docinto "serverquery"
+		dodoc "serverquerydocs"/*.txt
+
+		docinto "ts3server"
+		dodoc "doc"/*.txt
+	fi
+
+	# Install tsdns
+	if use tsdns; then
+		exeinto "/opt/teamspeak3-server"
+		doexe "tsdns/tsdnsserver"
+		dodir "/opt/bin"
+		dosym "../teamspeak3-server/tsdnsserver" "/opt/bin/tsdnsserver"
+
+		insinto "/etc/teamspeak3-server"
+		doins "tsdns/tsdns_settings.ini.sample"
+
+		docinto "tsdns"
+		dodoc "tsdns/README" "tsdns/USAGE"
+	fi
+
+	# Install docs
+	einstalldocs
+
+	# Keep directories
+	keepdir "/etc/teamspeak3-server"
+	keepdir "/var/log/teamspeak3-server"
+
+	# Protect config
+	# if use mysql; then
+	#	echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini\"" > "${T}"/99teamspeak3-server || die
+	# else
+	echo "CONFIG_PROTECT=\"/etc/teamspeak3-server/ts3server.ini\"" > "${T}"/99teamspeak3-server || die
+	# fi
+	doenvd "${T}"/99teamspeak3-server
+
+	# Set permissions
+	fowners -R teamspeak:teamspeak "/etc/teamspeak3-server" "/opt/teamspeak3-server" "/var/log/teamspeak3-server"
+}
+
+pkg_postinst() {
+	elog "If you have a Non-Profit License (NPL),"
+	elog "place it in /opt/teamspeak3-server as licensekey.dat."
+}