diff --git a/www-servers/jellyfin-bin/Manifest b/www-servers/jellyfin-bin/Manifest
index da83b34..7040175 100644
--- a/www-servers/jellyfin-bin/Manifest
+++ b/www-servers/jellyfin-bin/Manifest
@@ -7,3 +7,6 @@ DIST jellyfin-bin-10.7.0-web.deb 35057408 BLAKE2B 7f5e242ccf3c0e2ad6f4b8044f9244
 DIST jellyfin-bin-10.7.0_rc4-server-amd64.deb 37872820 BLAKE2B 02cb2c827b8a2b03d15cd457d805520fef290efbc6a261fd8bf6817c2a907718e6edcecf92b81999306e6f74284fb111fa7ea72828d1742f78daaf7daae6d984 SHA512 78565b364acdf96390ad58bdf8c49d98be6b6db0d3ca91a0828d32655cc7bfcd7b194ab83eeab0df359875e15bda11ceb30de23d1f24c1f60603e4b29efa2124
 DIST jellyfin-bin-10.7.0_rc4-server-arm64.deb 33826736 BLAKE2B 486eb2138c60b6bcd3b5c560f828bb5265d084e38658db3fb432964b4886d95262d2458bcd8557161d1f8bbf953d6e4beea1424e209b384dd249a16a5943c681 SHA512 4eb7394011ad9dd1afe756552b4abdb063a84cf550487eef95962e68e243616d1a06eff9a0bdc921fa9666ecdb840eb8cc11f4a62b65d7acd14ed8121cf01d1b
 DIST jellyfin-bin-10.7.0_rc4-web.deb 35040604 BLAKE2B 7a6e4c6d30a8bc8636c92253c98a60f95a3dd8d30c8637558bb09446cc14feddc8f171e762dc01cacdf1bd4895ea64e6a9b4591146a5e206309e0c1dbdd67da4 SHA512 54de6f7016ddad78cc8af8ee2514b2b7ff22c7d1bbd4dba76fbaca312bff2f5889d6a0a950aed084997139dc92a2ef5ce37185a652dc75cba288edd5e39e0eff
+DIST jellyfin-bin-10.7.1-server-amd64.deb 37870236 BLAKE2B 49da581371c294d3787eb26796a8578a8c22f285781890891f397095c7279e8ecde9a37c25f7c895e7ba2cd12f54460d43366162db193a4e73155e4fac1c37f5 SHA512 f91d59edbcea0d325910377b8cb59976b0692fd1efff20fcc59d45861ce3787351d6739894238bd9cd41a6ba8ef1d2a2b120312a69b738671d37d074432379f5
+DIST jellyfin-bin-10.7.1-server-arm64.deb 33818216 BLAKE2B fa8122b70d7702d2484f6c2ca97565bf8c7e27941b235318d46f917acae69f1dac63d95a1ea6adc2bfca21ff5137d353254b14e6bae6a3a0a241386f90482173 SHA512 678e453ef871338a55e0049d9ef42c4bf1dc4e467eae5e577edf363cff9465ec362a6e19a9ecc3d27fe67130430f114fb620672981689e5fc7edf32a376e19fe
+DIST jellyfin-bin-10.7.1-web.deb 35056504 BLAKE2B 5160f2425fa47973e479d945780c23553867bc90c1ed1d5b861be966d8f6df4c60778dbcbd51782371438b78008576ea3e8417a835e94bd0010d2a2e6846a0a3 SHA512 cb36140b0d65fc7d6de3c568472987aaf7f9c8a244bc136bc21a4f9203ad2c656084060f1161f11d99129abc855efa81f28fc7b269a18e66e3c12b088395beef
diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.7.1.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.7.1.ebuild
new file mode 100644
index 0000000..f6b5e55
--- /dev/null
+++ b/www-servers/jellyfin-bin/jellyfin-bin-10.7.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin}"
+
+if [[ "${PV}" == *_rc* ]]; then
+	# _rc -> ~rc
+	MY_PV="${PV/_rc/~rc}"
+	SRV_SRC="${MY_PN}-server_${MY_PV}"
+	WEB_SRC="${MY_PN}-web_${MY_PV}"
+	RELEASE="stable-rc"
+else
+	# Add "-1"
+	MY_PV="${PV}"
+	SRV_SRC="${MY_PN}-server_${MY_PV}-1"
+	WEB_SRC="${MY_PN}-web_${MY_PV}-1"
+	RELEASE="stable"
+fi
+
+BASE_URI="https://repo.jellyfin.org/releases/server/debian/versions/${RELEASE}"
+
+inherit unpacker systemd wrapper
+
+DESCRIPTION="The Free Software Media System"
+HOMEPAGE="https://jellyfin.org"
+SRC_URI="
+	amd64? (
+		${BASE_URI}/server/${MY_PV}/${SRV_SRC}_amd64.deb -> ${P}-server-amd64.deb
+	)
+	arm64? (
+		${BASE_URI}/server/${MY_PV}/${SRV_SRC}_arm64.deb -> ${P}-server-arm64.deb
+	)
+	${BASE_URI}/web/${MY_PV}/${WEB_SRC}_all.deb -> ${P}-web.deb
+"
+
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+DEPEND="
+	!www-servers/jellyfin
+"
+RDEPEND="
+	${DEPEND}
+	>=media-video/ffmpeg-4.2.2
+	acct-group/jellyfin
+	acct-user/jellyfin
+	app-crypt/mit-krb5
+	dev-db/sqlite
+	dev-util/lttng-ust
+	media-libs/fontconfig
+	media-libs/freetype
+"
+
+QA_PREBUILT="usr/lib/${MY_PN}/bin/*"
+QA_PRESTRIPPED="${QA_PRESTRIPPED}"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${MY_PN}-default.patch"
+)
+
+src_unpack() {
+	# https://gitlab.com/src_prepare/src_prepare-overlay/-/merge_requests/145
+	if use amd64
+	then
+		unpack_deb "${P}-server-amd64.deb"
+	elif use arm64
+	then
+		unpack_deb "${P}-server-arm64.deb"
+	else
+		die "Unsupported architecture"
+	fi
+	unpack_deb "${P}-web.deb"
+}
+
+src_install() {
+	# Install the Server part
+	insinto usr/lib/
+	doins -r "usr/lib/${MY_PN}"
+	insinto etc
+	doins -r "etc/${MY_PN}"
+
+	# Install the Web UI part
+	insinto "usr/share/${MY_PN}/web"
+	doins -r "usr/share/${MY_PN}/web"/*
+
+	# Install wrappers
+	make_wrapper "${MY_PN}" "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}"
+	dosym "${EPREFIX}/usr/bin/${MY_PN}" "${EPREFIX}/usr/bin/${PN}"
+
+	# Install services
+	newinitd "${FILESDIR}/${MY_PN}" "${MY_PN}"
+	doconfd "etc/default/${MY_PN}"
+	dosym "${EPREFIX}/etc/conf.d/${MY_PN}" "${EPREFIX}/etc/default/${MY_PN}"
+	systemd_dounit "lib/systemd/system/${MY_PN}.service"
+	systemd_install_serviced "etc/systemd/system/${MY_PN}.service.d/${MY_PN}.service.conf"
+
+	# Fix permissions
+	chmod +x "${ED}/usr/lib/${MY_PN}"/* || die
+	chmod +x "${ED}/usr/lib/${MY_PN}/bin"/* || die
+	chown -R jellyfin:jellyfin "${ED}/usr/lib/${MY_PN}" || die
+}