diff --git a/media-plugins/vdr-streamdev/Manifest b/media-plugins/vdr-streamdev/Manifest
index cfdc3ffeac385..0e4ec87559bad 100644
--- a/media-plugins/vdr-streamdev/Manifest
+++ b/media-plugins/vdr-streamdev/Manifest
@@ -1 +1,2 @@
 DIST vdr-streamdev-0.6.3.tar.gz 196906 BLAKE2B 300c24aac6f0c59fc438eafa9a300e0b68dbfb43064cf887ab9d1fbdc1b22a8ec5349a38fa5c2188ef78dbc1ac7f238e88abe0ed9d1cbcd01e4a1afde7b890cf SHA512 2c949f08f399f2570a54da67809235b6882d594fc5583b27df96b3e87951bcfc62f96c9aef715130540620cbe54f028106598941fe8cbdb80b3d0943009c039f
+DIST vdr-streamdev-0.6.4.tar.gz 196932 BLAKE2B 330e3af0b3384b125140748b270f0f85095d8216ca27715224e19090a8b38a3e362a9c97c53dedec7d591d76c614217d6feb56b405612e231e321f6698e8d8d5 SHA512 8687e3f64fdd60257049dfc6955042f3983f30f2f66b2c96525109e1dbe36584054b15aaf3086b93f0026f641541d8322a9b0ada1308f7e1bdffe47db5c2892b
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.6.4.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.4.ebuild
new file mode 100644
index 0000000000000..9bdc72072d334
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.6.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: Client/Server and http streaming plugin"
+HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-streamdev"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-streamdev-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="client +server"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND=">=media-video/vdr-2.3:="
+RDEPEND="${DEPEND}"
+BDEPEND="acct-user/vdr"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-streamdev-.*
+	usr/lib64/vdr/plugins/libvdr-streamdev-.*"
+
+# vdr-plugin-2.eclass changes
+PO_SUBDIR="client server"
+
+src_prepare() {
+	# make detection in vdr-plugin-2.eclass for new Makefile handling happy
+	echo "# SOFILE" >> Makefile || die "modify Makefile failed"
+
+	# remove unnecessary include
+	sed -i Makefile -e "s:-I\$(VDRDIR)/include::" || die "modify Makefile failed"
+
+	vdr-plugin-2_src_prepare
+
+	local flag
+	for flag in client server; do
+		if ! use ${flag}; then
+			sed -i Makefile \
+				-e '/^.PHONY:/s/'${flag}'//' \
+				-e '/^.PHONY:/s/'install-${flag}'//' \
+				-e '/^all:/s/'${flag}'//' \
+				-e '/^install:/s/'install-${flag}'//' || die "modify Makefile failed"
+		fi
+	done
+
+	fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	if use server; then
+		insinto /usr/share/vdr/streamdev
+		doins streamdev-server/externremux.sh
+
+		insinto /usr/share/vdr/rcscript
+		newins "${FILESDIR}"/rc-addon-0.6.0.sh plugin-streamdev-server.sh
+
+		newconfd "${FILESDIR}"/confd-0.6.0 vdr.streamdev-server
+
+		insinto /etc/vdr/plugins/streamdev-server
+		newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+		fowners vdr:vdr /etc/vdr -R
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if [[ -e "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then
+		einfo "move config file to new config DIR ${EROOT}/etc/vdr/plugins/streamdev-server/"
+		mv "${EROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf \
+			"${EROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf || die
+	fi
+}