diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 21572772ca78a..46ea4db5648b8 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,2 +1,3 @@
 DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8f04e31531e2591dc0bb6f84190d35fb6b9128dd512bab59648e838f479fd81894f97cfce7af4365e0932b26e4 SHA512 ff851a5c3a225c8b6efa9fbf90bd72439bc1303f8138384c2bac779d6cfe52c77125ec3b80b320205e08bbee9910c5203a95c112909c3336750938d2271c2517
 DIST svn2git-1.0.19.tar.gz 54140 BLAKE2B 50801e4f8a4828da05b5b82e764b742ee902b56cfd769ec9083a1dba1c7aaeebe3b84b92bb4b1c6b299efc153085f445c11440b500032de4eda62376693a67d2 SHA512 9d7fdc235c94dab2c4cd79b5ade4e49e9cf5d1f7a6e89c83ff4803dae4bdddd09f9a085406d7d23400f0ed54894e65b134424a6be007266af6be5807ded8e8de
+DIST svn2git-1.0.20.tar.gz 54669 BLAKE2B bf77f4e59faae885b721c5653775047e25a425b4b6f33a6685aafc7e1c5bf0d0f387e4f352a07407eadca95a79500b43963a067cf4a292c3ccc2dcd8159d88b4 SHA512 13474f25aa7a02f2b1f9d778e63b3c16577853d4256c66f4ff3daa7c7697da95189a2f58e084596fa1f902b47f3ee1af8747c1a89f60a7612525305033b2d588
diff --git a/dev-vcs/svn2git/svn2git-1.0.20.ebuild b/dev-vcs/svn2git/svn2git-1.0.20.ebuild
new file mode 100644
index 0000000000000..e48a8a4ebd1c3
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.20.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_SUBMODULES=()
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+src_configure() {
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+		VERSION=${PV}
+	)
+	eqmake6 "${qmake_args[@]}" fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
+}
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 84c5b8c374225..6161e43ada544 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,8 @@ SLOT="0"
 # KEYWORDS way up
 
 DEPEND="
-	dev-qt/qtcore:5
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6
 	dev-vcs/subversion"
 RDEPEND="${DEPEND}
 	dev-vcs/git"
@@ -34,7 +35,7 @@ src_configure() {
 		PREFIX=/usr
 		SVN_INCLUDE=/usr/include/subversion-1
 	)
-	eqmake5 "${qmake_args[@]}" fast-export2.pro
+	eqmake6 "${qmake_args[@]}" fast-export2.pro
 }
 
 src_install() {