diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index d7a298d02061b..083e9e0d1073b 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,3 +1,5 @@
 DIST cvs-fast-export-1.61.tar.gz 525785 BLAKE2B 64089fe0f99e247505152ad20c618a721917fabcf28e29ede330e89d9ffc3b05e314e09deb85c9c23de95acfa6193a6dd67636374862d58df231e06fd8313f09 SHA512 505a305b3f383a9df0f519ec0bbf92d5fbd2759b5be39b3eced898a00bd06290f2905e6add49c992ff69fdf468f6c83e15e8810bdf12d08eec0289aa7930df4e
 DIST cvs-fast-export-1.67.tar.gz 575386 BLAKE2B 080ca91d1002707dfc81d2d87373cb47b314b7f59dfb49081f4279b6d97ca43165d5dceb827e281deeae4d617bdec062475afb652b2680124c03455e155e9151 SHA512 193ae2a9ded2052d393891e0d847ca28a6b955fb17396d31c84265ff4336a9eb769d290fbdb645b7a528b17235e1a9a611d8b703977037229c001e6e46129445
 DIST cvs-fast-export-1.68.tar.gz 589722 BLAKE2B 2e904c60c7431a64afe24bfc8d57d8eb533d41c5905423a656f6ed2c3b6d0a646466941c94d002351c3b3bd336e3d846c3dba8cfd22f9256fd79d4db6f5dd64c SHA512 2e3eb1f305aa05320ba244cb34816dc3378caeb5bc0de6b2991f001f28d7eea7dc48d1bca297a38c934671a942be0bc810fc711aff8950461582a064d7a198d9
+DIST cvs-fast-export-2.0-deps.tar.xz 16180 BLAKE2B 447ec8b80d856e27b08c389edc912e7bbb42559b3ea7be6b996c5351807c0b115728130d06289d207219cd333275d0d6afe1c0ea22278299fe36610aea913938 SHA512 f158719ed54e0b16f33589571fe17d30e6d59080b76d5f067e8e53f196ba9430ae9ef1446b60094332759687b17bc9f9a0efdb940794a16495d41daf82060c6d
+DIST cvs-fast-export-2.0.tar.gz 478097 BLAKE2B 27e0c61dea0e8185b009204b035a99a4d590b9f9347c571bfd8f094e29948befbf0970e2aac837bdec833352a600c4d637708de47c74f70380bcc07d4b16e7e4 SHA512 4edcb7f12ea4146ada9f1b14aaba8841c8c110cda9bc30ee2e8efa6dfe91ee3d0f05356ff581ac1d9b1710bd4db1f4f49fda6ab91dd5b4f5f6c6a7a88ddcdaf1
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-2.0.ebuild b/dev-vcs/cvs-fast-export/cvs-fast-export-2.0.ebuild
new file mode 100644
index 0000000000000..245077b219c23
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/"
+SRC_URI="
+	http://www.catb.org/~esr/${PN}/${P}.tar.gz
+	https://distfiles.gentoo.org/pub/dev/mattst88@gentoo.org/${P}-deps.tar.xz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-ruby/asciidoctor"
+
+src_compile() {
+	# '.adoc.html' rules can't be executed in parallel
+	# as they reuse the same 'docbook-xsl.css' file name.
+	emake -j1 html
+	emake man
+	ego build -ldflags "-X main.version=${PV}" -o ${PN} .
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc {NEWS,README,TODO,hacking,reporting-bugs}.adoc
+}