diff --git a/www-servers/jellyfin-bin/files/jellyfin-default.patch b/www-servers/jellyfin-bin/files/jellyfin-default.patch
new file mode 100644
index 0000000..85d3dfc
--- /dev/null
+++ b/www-servers/jellyfin-bin/files/jellyfin-default.patch
@@ -0,0 +1,12 @@
+index 7cbfa88..e7ac16b 100644
+--- a/etc/default/jellyfin
++++ b/etc/default/jellyfin
+@@ -25,7 +25,7 @@ JELLYFIN_WEB_OPT="--webdir=/usr/share/jellyfin/web"
+ JELLYFIN_RESTART_OPT="--restartpath=/usr/lib/jellyfin/restart.sh"
+ 
+ # ffmpeg binary paths, overriding the system values
+-JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg"
++#JELLYFIN_FFMPEG_OPT="--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg"
+ 
+ # [OPTIONAL] run Jellyfin as a headless service
+ #JELLYFIN_SERVICE_OPT="--service"
diff --git a/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild b/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild
index 903af1a..db1d883 100644
--- a/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild
+++ b/www-servers/jellyfin-bin/jellyfin-bin-10.6.4.ebuild
@@ -42,40 +42,37 @@ RDEPEND="
 "
 
 QA_PRESTRIPPED="
-	usr/lib/jellyfin/bin/System.Globalization.Native.so
-	usr/lib/jellyfin/bin/System.IO.Compression.Native.so
-	usr/lib/jellyfin/bin/System.Native.so
-	usr/lib/jellyfin/bin/System.Net.Http.Native.so
-	usr/lib/jellyfin/bin/System.Net.Security.Native.so
-	usr/lib/jellyfin/bin/System.Security.Cryptography.Native.OpenSsl.so
-	usr/lib/jellyfin/bin/createdump
-	usr/lib/jellyfin/bin/jellyfin
-	usr/lib/jellyfin/bin/libSkiaSharp.so
-	usr/lib/jellyfin/bin/libclrjit.so
-	usr/lib/jellyfin/bin/libcoreclr.so
-	usr/lib/jellyfin/bin/libcoreclrtraceptprovider.so
-	usr/lib/jellyfin/bin/libdbgshim.so
-	usr/lib/jellyfin/bin/libe_sqlite3.so
-	usr/lib/jellyfin/bin/libhostfxr.so
-	usr/lib/jellyfin/bin/libhostpolicy.so
-	usr/lib/jellyfin/bin/libmscordaccore.so
-	usr/lib/jellyfin/bin/libmscordbi.so
+	usr/lib/${MY_PN}/bin/System.Globalization.Native.so
+	usr/lib/${MY_PN}/bin/System.IO.Compression.Native.so
+	usr/lib/${MY_PN}/bin/System.Native.so
+	usr/lib/${MY_PN}/bin/System.Net.Http.Native.so
+	usr/lib/${MY_PN}/bin/System.Net.Security.Native.so
+	usr/lib/${MY_PN}/bin/System.Security.Cryptography.Native.OpenSsl.so
+	usr/lib/${MY_PN}/bin/createdump
+	usr/lib/${MY_PN}/bin/${MY_PN}
+	usr/lib/${MY_PN}/bin/libSkiaSharp.so
+	usr/lib/${MY_PN}/bin/libclrjit.so
+	usr/lib/${MY_PN}/bin/libcoreclr.so
+	usr/lib/${MY_PN}/bin/libcoreclrtraceptprovider.so
+	usr/lib/${MY_PN}/bin/libdbgshim.so
+	usr/lib/${MY_PN}/bin/libe_sqlite3.so
+	usr/lib/${MY_PN}/bin/libhostfxr.so
+	usr/lib/${MY_PN}/bin/libhostpolicy.so
+	usr/lib/${MY_PN}/bin/libmscordaccore.so
+	usr/lib/${MY_PN}/bin/libmscordbi.so
 "
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${MY_PN}-default.patch"
+)
+
 src_unpack() {
 	unpack_deb "${P}-server-${ARCH}.deb"
 	unpack_deb "${P}-web.deb"
 }
 
-src_prepare() {
-	default
-
-	# Comment JELLYFIN_FFMPEG_OPT as that path is wrong
-	sed -i "s/JELLYFIN_FFMPEG_OPT=/#JELLYFIN_FFMPEG_OPT=/" "etc/default/${MY_PN}"
-}
-
 src_install() {
 	# Install the Server part
 	insinto usr/lib/