diff --git a/media-video/mkvalidator/Manifest b/media-video/mkvalidator/Manifest
index 75824e8154248..8f69ce1275396 100644
--- a/media-video/mkvalidator/Manifest
+++ b/media-video/mkvalidator/Manifest
@@ -1 +1,2 @@
 DIST mkvalidator-0.5.2.tar.bz2 612382 BLAKE2B a60b64902e068b82f95f61295088dbf56ab122918e46a36043246310fcf7e4a6c7f997866a8802a119e18305acbbe532acfb7cde907499168f75436b86ad7482 SHA512 c87d89ce97f8c701f73932012af8c8df3d6e5ac8b0ee24e48000f93b0e29e02ce74250565f6a662fa0c9c2fbd9910705e1d1403ac6d2ac2fe54331ef150d00cc
+DIST mkvalidator-0.6.0.tar.bz2 661500 BLAKE2B f23ecf5f9691c8aea4f9d9099720431de83e92f36e495059ec856f4b43bfbd30931e539fce186d9865dc2fe6bff4b69eb8a49f92ce1d1507c48da6a0fe578bfa SHA512 b8ef7721ea4c2c9d3cbc2d813d2f0476ba36270080e636fe0be40319569b4a32beac6a9a4b0a9f56c6c700d5cba5927e77f93a4498d8bf1037720506c7676b7a
diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
index 6fea51690bb50..eb2107f5ca47a 100644
--- a/media-video/mkvalidator/metadata.xml
+++ b/media-video/mkvalidator/metadata.xml
@@ -8,4 +8,8 @@
 	<longdescription lang="en">
 		mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">matroska</remote-id>
+		<remote-id type="github">Matroska-Org/foundation-source</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-video/mkvalidator/mkvalidator-0.6.0.ebuild b/media-video/mkvalidator/mkvalidator-0.6.0.ebuild
new file mode 100644
index 0000000000000..dbb1133279187
--- /dev/null
+++ b/media-video/mkvalidator/mkvalidator-0.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="mkvalidator is a command line tool to verify Matroska files for spec conformance"
+HOMEPAGE="https://www.matroska.org/downloads/mkvalidator.html"
+SRC_URI="https://downloads.sourceforge.net/project/matroska/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_SHARED_LIBS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	newdoc ChangeLog.txt ChangeLog
+	newdoc ReadMe.txt README
+
+	cd "${BUILD_DIR}" || die
+	dobin mkvalidator/mkvalidator
+}