diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index e723192..8378fbd 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,2 +1,2 @@
-DIST teamspeak3-server_linux_amd64-3.3.0.tar.bz2 8383889 BLAKE2B 7397f1c084c7487b613db7c2a71670320636b1c3c5fa353f255d721404dabee39f4f876440613772a1c784947393907c58fb7f275bf212ac3ae46957feb0c5a2 SHA512 375d1476fcbc507aec75a781ee071ccb99753290ecbfb2f2709c9a14556502f27adbbfc31abc9905e33eab3796a6addbde3f81e4714969e18204873c62c0647f
-DIST teamspeak3-server_linux_x86-3.3.0.tar.bz2 8257788 BLAKE2B d23dab70b2f847cf8c1e52b36dd72afa8c6f463b7439d3fd0b10e62586e6678c70eced16c934f87cd8fcc18ee1d2013189a9e60c56dfebf356bb4975f0fce821 SHA512 9b85b75d55f0ea2c89bfc0925de008268cb0c82894dc6909588dd2de6d0c271ad19102f7cc6f5d5f1143be3e3e9c56ac6206fb19d120eede1fc9f4ec67a58142
+DIST teamspeak3-server_linux_amd64-3.3.1.tar.bz2 8415114 BLAKE2B 22908295d78677ecd09778c85b3e8dae6acd2170732759760884b76bb3614c4af8553910b9c62800bf5ab9cd32423acfe3c9bb476b7b6d7450330626f9f8ad8e SHA512 4335ed9a3ba11a8b26385f5c0b73c01da8c7374b3c0fa24bdeefc66bc297dd241e012ab30e9d0185c44a6c575a38d6c131dfdd8819147dd34f7e79d940ec49cb
+DIST teamspeak3-server_linux_x86-3.3.1.tar.bz2 8289228 BLAKE2B 3bdc1fcc29b9650ab6b1eda9d7cb9c201993fed0d194bf75071562d4f553b21098a31d1081113da7b8269056af4bcc3761acff17cf133c9fce874f63c2f4ec75 SHA512 734abdc9e0f3b6bda4fe5c71da51167745d2bdf56890a93c3b4d6d944231e9a561735224d4541f2b70584810aeca8f73f97334d26949fcd1000a708664c44eeb
diff --git a/media-sound/teamspeak-server/files/teamspeak.tmpfiles b/media-sound/teamspeak-server/files/teamspeak.tmpfiles
deleted file mode 100644
index 1b1d7f0..0000000
--- a/media-sound/teamspeak-server/files/teamspeak.tmpfiles
+++ /dev/null
@@ -1,4 +0,0 @@
-# systemd tmpfile settings for teamspeak3-server
-# See tmpfiles.d(5) for details
-
-d /var/run/teamspeak3 0755 teamspeak teamspeak -
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
similarity index 74%
rename from media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild
rename to media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
index 853e132..cf44a12 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
@@ -11,14 +11,13 @@ DESCRIPTION="A server software for hosting quality voice communication via the i
 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 )"
+		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 )"
+		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"
@@ -45,10 +44,12 @@ src_unpack() {
 }
 
 src_install() {
-	keepdir /etc/teamspeak3-server
 	diropts -o teamspeak -g teamspeak
 	keepdir /opt/teamspeak3-server /var/log/teamspeak3-server
 
+	diropts
+	keepdir /etc/teamspeak3-server
+
 	touch ${D%/}/opt/teamspeak3-server/.ts3server_license_accepted || die
 
 	exeinto /opt/teamspeak3-server
@@ -60,10 +61,8 @@ src_install() {
 	exeinto /opt/teamspeak3-server
 	doexe libts3db_sqlite3.so libts3_ssh.so
 
-	docinto	serverquery
-	dodoc -r serverquerydocs/.
-
-	dosym ../../usr/share/doc/teamspeak-server-${PV}/serverquery /opt/teamspeak3-server/serverquerydocs
+	insinto /opt/teamspeak3-server/serverquerydocs
+	doins -r serverquerydocs/.
 
 	insinto /opt/teamspeak3-server/sql
 	doins sql/*.sql
@@ -72,9 +71,22 @@ src_install() {
 	insinto /etc/teamspeak3-server
 	newins "${FILESDIR}"/ts3server.ini-r1 ts3server.ini
 
+	dodoc CHANGELOG
+	docinto ts3server
+	dodoc doc/*.txt
+
 	newinitd "${FILESDIR}"/teamspeak.initd-r1 teamspeak3-server
 	systemd_newunit "${FILESDIR}"/teamspeak.service teamspeak3-server.service
 
+	newenvd - 99teamspeak3-server <<- EOF
+		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini /etc/teamspeak3-server/tsdns_settings.ini"
+	EOF
+
+	if use doc; then
+		docinto html
+		dodoc -r doc/serverquery/.
+	fi
+
 	if use mysql; then
 		insinto /etc/teamspeak3-server
 		newins "${FILESDIR}"/ts3server_mariadb.ini.sample-r1 ts3server_mariadb.ini.sample
@@ -89,11 +101,6 @@ src_install() {
 		doins -r sql/updates_and_fixes
 	fi
 
-	if use doc; then
-		docinto serverquery/html
-		dodoc doc/serverquery/*
-	fi
-
 	if use tsdns; then
 		exeinto /opt/teamspeak3-server
 		doexe tsdns/tsdnsserver
@@ -103,17 +110,9 @@ src_install() {
 		insinto /etc/teamspeak3-server
 		doins tsdns/tsdns_settings.ini.sample
 
-		docinto ts3server
-		dodoc doc/*.txt
-
 		docinto tsdns
-		dodoc tsdns/README tsdns/USAGE
+		dodoc tsdns/{README,USAGE}
 	fi
-
-	cat <<- EOF > "${T}"/99teamspeak3-server || die
-		CONFIG_PROTECT="/etc/teamspeak3-server/ts3server.ini /etc/teamspeak3-server/ts3server_mariadb.ini"
-	EOF
-	doenvd "${T}"/99teamspeak3-server
 }
 
 pkg_postinst() {