diff --git a/net-misc/universalmediaserver/Manifest b/net-misc/universalmediaserver/Manifest
index b6b7280..a02af3b 100644
--- a/net-misc/universalmediaserver/Manifest
+++ b/net-misc/universalmediaserver/Manifest
@@ -1,6 +1,4 @@
 AUX universalmediaserver.confd 165 BLAKE2B e0354bfd4162d25c589c1ddd8627ef43c077b8311b1208df7589d33bc5244dbfb6104c4e7196bee136a92d4fd7aea34782c3951cf0824556c28bbe2e33284836 SHA512 49f0185cd898c6ebe193e08c75c0a0d4f8dc9dbecd0420c22449f82f1bef47f3b57e5dde614b64b67ae697f87e2a11492dbedad9d3ff4239f96667a7302dc281
 AUX universalmediaserver.initd 401 BLAKE2B 29a66366275dbb60a3363efa304ac948161cee0242df8b5420a419831b58b4784ba0e1f762e833e410ce25d6352a607f8a337bc3fac49a254b56f0e3fc99dca9 SHA512 eeeccb023c635360e4ea98cbe6a9d21f5de8c353eda6bfa43f593930fe8de1c7cf618c0a89fa7598295fda3ea277fedb7b8bbde1425cc1cd955248afadcaadf6
-DIST universalmediaserver-10.12.0.tar.gz 137762855 BLAKE2B 56f2eeab0a59f6271d1eabb6b1f67f97849e01e2ecf010dbe1c6ba8bb30a9ca3331b2fb697685bdd3b4871e470cf0963cac4a6e5284325fe0ee46d587ea1dac1 SHA512 44efbe030ab05f085965e77530bf3a70b67ade93a5058e8440ddecc5ca3be9b86865364168ce1fbe14e7e73af14bc7b9a3821bba88966678395925168a6b4bd9
-DIST universalmediaserver-9.4.3.tar.gz 172769428 BLAKE2B 4e070866a035b412e00b5e92c84bd992e5e67a4da5f80c97daf06e61f715179991fb2eb60cebd1c3ee5dafa50d8085466e7479bb3408ebaf22f1c3449fd121bc SHA512 6a1ee4ea31ea598d4eda81ce174b337366c39c76c3f438fb126cfde30fcba9565781946951b5e8745c84ec2004056fc077052ed4bd2d27790d1efd4620a62557
-EBUILD universalmediaserver-10.12.0.ebuild 2306 BLAKE2B 769742f846920a7407b62b7cd4f635319953cb418d51c10f6d6d14e4aff31698bb922dfa2e790ede43bd412427a5ccfcedc049fc7810162dbb4e66b80008c949 SHA512 dd173f95b4a5d7c232bde87d7e218ed63a16fd115e9f566fb81d1a1d4125233f1fd3c5a13b94ff1f78f77950c2646e1234af29b042ac27f89167eb8b5b8a0780
-EBUILD universalmediaserver-9.4.3.ebuild 2306 BLAKE2B 769742f846920a7407b62b7cd4f635319953cb418d51c10f6d6d14e4aff31698bb922dfa2e790ede43bd412427a5ccfcedc049fc7810162dbb4e66b80008c949 SHA512 dd173f95b4a5d7c232bde87d7e218ed63a16fd115e9f566fb81d1a1d4125233f1fd3c5a13b94ff1f78f77950c2646e1234af29b042ac27f89167eb8b5b8a0780
+DIST universalmediaserver-11.2.0.tar.gz 152070940 BLAKE2B 6defdcf6bdaccb30aa210a07233ec33531489c8eeda550cf620aa19bf80187eb7056934a1fa4ba01855c1dab593b07e5ad07e8666abf56cb6918e83f966ddc51 SHA512 0fae48dbd8557731f4b651bbdc86dee5842e8868b46b2699220ae15e09456220938b339fae156ba67861cf73f6ab1c5d27bb8bd6c0cbfa15b8b48549ef310842
+EBUILD universalmediaserver-11.2.0.ebuild 2237 BLAKE2B 51cfb1a22381ef8a0b58017874ea5b34da83d9f98f284bd3a6abcfd5716dc464b92c84432490b4c3f1b7e0b2fbd8c6597619229804df96ed90965a6d5d1cb2f7 SHA512 e5e23b30b537699683d37288d66790769596bc6a09b48b1233ab7bfff5e0ec520ea8f09b6b7728f797401782e31ac54219c0f846e72f1f7cf88b3b0a675487af
diff --git a/net-misc/universalmediaserver/universalmediaserver-10.12.0.ebuild b/net-misc/universalmediaserver/universalmediaserver-11.2.0.ebuild
similarity index 83%
rename from net-misc/universalmediaserver/universalmediaserver-10.12.0.ebuild
rename to net-misc/universalmediaserver/universalmediaserver-11.2.0.ebuild
index c4d9ef3..0a8e8b0 100644
--- a/net-misc/universalmediaserver/universalmediaserver-10.12.0.ebuild
+++ b/net-misc/universalmediaserver/universalmediaserver-11.2.0.ebuild
@@ -5,7 +5,7 @@
 # Todo:
 # - Add support for none x86_64
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils
 
@@ -16,22 +16,23 @@ SRC_URI="https://github.com/UniversalMediaServer/UniversalMediaServer/releases/d
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+dcraw +ffmpeg +libmediainfo +libzen +mplayer multiuser tsmuxer +vlc"
+IUSE="+dcraw +ffmpeg +libmediainfo +libzen +mplayer multiuser +vlc"
 
 DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8.0
+RDEPEND=">=virtual/jre-17
 	dcraw? ( media-gfx/dcraw )
 	ffmpeg? ( media-video/ffmpeg[encode] )
 	libmediainfo? ( media-libs/libmediainfo )
 	libzen? ( media-libs/libzen )
 	mplayer? ( media-video/mplayer[encode] )
-	tsmuxer? ( media-video/tsmuxer )
 	vlc? ( media-video/vlc[encode] ) "
 
 S=${WORKDIR}/ums-${PV}
 UMS_HOME=/opt/${PN}
 
 src_prepare() {
+	default
+
 	if use multiuser; then
 		cat > ${PN} <<-EOF
 		#!/bin/sh
@@ -60,7 +61,7 @@ src_prepare() {
 	Categories=Network;
 	EOF
 
-	unzip -j ums.jar resources/images/icon-{32,256}.png || die
+	unzip -j ums.jar resources/images/icon-{32,256}.png || die -n "failed to extract icons" || return ${?}
 }
 
 src_install() {
@@ -70,9 +71,8 @@ src_install() {
 	doexe UMS.sh
 
 	insinto ${UMS_HOME}
-	doins -r ums.jar *.conf documentation plugins renderers *.xml
-	use tsmuxer && dosym /opt/tsmuxer/bin/tsMuxeR ${UMS_HOME}/linux/tsMuxeR
-	dodoc CHANGELOG.txt README.md
+	doins -r ums.jar *.conf documentation renderers web *.xml
+	dodoc CHANGELOG.md README.md
 
 	newicon -s 32 icon-32.png ${PN}.png
 	newicon -s 256 icon-256.png ${PN}.png
diff --git a/net-misc/universalmediaserver/universalmediaserver-9.4.3.ebuild b/net-misc/universalmediaserver/universalmediaserver-9.4.3.ebuild
deleted file mode 100644
index c4d9ef3..0000000
--- a/net-misc/universalmediaserver/universalmediaserver-9.4.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Todo:
-# - Add support for none x86_64
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Universal Media Server is a DLNA-compliant UPnP Media Server."
-HOMEPAGE="http://www.universalmediaserver.com/"
-SRC_URI="https://github.com/UniversalMediaServer/UniversalMediaServer/releases/download/${PV}/UMS-${PV}-x86_64.tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+dcraw +ffmpeg +libmediainfo +libzen +mplayer multiuser tsmuxer +vlc"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.8.0
-	dcraw? ( media-gfx/dcraw )
-	ffmpeg? ( media-video/ffmpeg[encode] )
-	libmediainfo? ( media-libs/libmediainfo )
-	libzen? ( media-libs/libzen )
-	mplayer? ( media-video/mplayer[encode] )
-	tsmuxer? ( media-video/tsmuxer )
-	vlc? ( media-video/vlc[encode] ) "
-
-S=${WORKDIR}/ums-${PV}
-UMS_HOME=/opt/${PN}
-
-src_prepare() {
-	if use multiuser; then
-		cat > ${PN} <<-EOF
-		#!/bin/sh
-		if [ ! -e ~/.${PN} ]; then
-			echo "Copying ${UMS_HOME} to ~/.${PN}"
-			cp -pPR "${UMS_HOME}" ~/.${PN}
-		fi
-		export UMS_HOME=\${HOME}/.${PN}
-		exec "\${UMS_HOME}/UMS.sh" "\$@"
-		EOF
-	else
-		cat > ${PN} <<-EOF
-		#!/bin/sh
-		export UMS_HOME=${UMS_HOME}
-		exec "\${UMS_HOME}/UMS.sh" "\$@"
-		EOF
-	fi
-
-	cat > ${PN}.desktop <<-EOF
-	[Desktop Entry]
-	Name=Universal Media Server
-	GenericName=Media Server
-	Exec=${PN}
-	Icon=${PN}
-	Type=Application
-	Categories=Network;
-	EOF
-
-	unzip -j ums.jar resources/images/icon-{32,256}.png || die
-}
-
-src_install() {
-	dobin ${PN}
-
-	exeinto ${UMS_HOME}
-	doexe UMS.sh
-
-	insinto ${UMS_HOME}
-	doins -r ums.jar *.conf documentation plugins renderers *.xml
-	use tsmuxer && dosym /opt/tsmuxer/bin/tsMuxeR ${UMS_HOME}/linux/tsMuxeR
-	dodoc CHANGELOG.txt README.md
-
-	newicon -s 32 icon-32.png ${PN}.png
-	newicon -s 256 icon-256.png ${PN}.png
-
-	domenu ${PN}.desktop
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn "Don't forget to disable transcoding engines for software"
-		ewarn "that you don't have installed (such as having the ffmpeg"
-		ewarn "transcoding engine enabled when you only have mencoder)."
-	elif use multiuser; then
-		ewarn "Remember to refresh the files in ~/.config/UMS/"
-	fi
-}