diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index f9fb67cb06e2..066eafe12a53 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,4 +1,4 @@
-DIST org-mode-release_9.7.34.tar.gz 2365680 BLAKE2B 308389056148e7ae3dba51cc3e754484bc5ec925e2761f6fee7a48a2c11ba8bb2c1bffebbfef6e06f7eaee240a3fd07e39abeb6c2267824f3b1199b283650b2e SHA512 27b80ac4c8c73f9409ccac816322fcabe67fc74ff16ba4fb109bbbcc40dc2bbc32599268f31d124a47741f0113c41cd52d85938f1b08b89fb44807690191ee58
-DIST org-mode-release_9.7.37.tar.gz 2365803 BLAKE2B 8391a6aa910759c67c6c206ea8678a943451e8ece1b35812cec7fa766b4944e170a50e7a1b25387a9b244a82fd3dcb045bbc7805aaad8cb9b7b03f3fa5ddd70a SHA512 822ed4901d2613a65d6629684262a2e4c056bb461ab78e1f10259d025e637c91a9924407d48628d6dc92fe103a4aacfaf526cd4dc7e037a9043932b9ae39f3ee
-DIST org-mode-release_9.7.38.tar.gz 2365808 BLAKE2B eadc6a37996b46368cdd6c9f45b10c3ae63688e2917870ad415d691dc0f52249767ec4111d79128cf96df317dddf9131044c20f046b40e4030e07884387dfc27 SHA512 999266f59892d3bbf9bd04311c54a9c718ab0ec6e4efd4881dc3f8eb4921176bab4bed47aa560a1d73cfdee01b936363c7d49b71f8438f3ce525e0ccded4a36c
-DIST org-mode-release_9.7.39.tar.gz 2365803 BLAKE2B 9f77f5bc73437efcf78d74d242f8e119af3c108db789e8f9ecc3c60254cdbb99448a21834419777f8f18df1063b6d8a0515408cecb8d064499ec87c601842d2d SHA512 768b59defbf77e9643b4d36dff64f57097cf5df470e16e77d13fe6d56bebd00d117260050182b286c6289823abd25856274a011fd2203a2d2ede7b84ca66bcc7
+DIST org-mode-9.7.34.tar.xz 1715144 BLAKE2B fa24c9df4f80e55f971a1baf1d2372aec1b52cdc5ffeccbbfb0d47637b2b32a1c8ad48e7a6a3e073893e1900ffaaf79d495a4da35d197d15f76e24f148142ce9 SHA512 8a5a49dfdb9ed15538cd3061b7bc562d024f80ca05c39f66c7b8835fae577ae83cc00397dc3ae4e62f43414469188957274e8e800f9cc5060c81d3f80aed98b1
+DIST org-mode-9.7.37.tar.xz 1715336 BLAKE2B 262945343a3ab09f3d4c0737bf0afbb6283937efcd927187d8d8f3a6b7c255bfe65e0dd7acf4d9228141b02481301f2a397cdb72d6f692979e9de7cd201e8f76 SHA512 1a6714d80643021a0e8a0b6e2975680aa299e33653e45fc73502fba4522d58f05512a5bfc42b9d494750dbafe6035a2990775b5b2c704d8982067560043e77c8
+DIST org-mode-9.7.38.tar.xz 1715364 BLAKE2B c60bea04c24149cd06b093c1a2483952b3457085507c116baebdf4c03c77fc02b5f2968fcbca5f330984a8a8dcbacb80f4ee81ef160c5c2d8376ec6c74544f35 SHA512 bbb4c297eb17d0e0d938b2e6fb296d5536aed46a78fbb09c518d10df0fdad9c6766588a9730491eabecd25a85afb89b10b888bc837d5a47c0011756f4ba18c8f
+DIST org-mode-9.7.39.tar.xz 1715308 BLAKE2B 9b9845efc3ac34ebe031ebe86801fe48faacf60e6e070ebbcec94cbc041e36e74c3fa7a8571ffdb86f2f039c1f8e69a2cb2f2fc89b69e764e6f326b65b2269eb SHA512 1c82ba36ccd4229d719a6553b200d6c6d5b4986962793327f1234aa82ada4b17d096a83c7f1322d04e8ae5fa3a7042a41e0a0c47c3569f1ad7ec0282cf128349
diff --git a/app-emacs/org-mode/org-mode-9.7.34.ebuild b/app-emacs/org-mode/org-mode-9.7.34.ebuild
index cd1d57a3d89d..ad5b1ddc126a 100644
--- a/app-emacs/org-mode/org-mode-9.7.34.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.34.ebuild
@@ -15,11 +15,8 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
 	S="${WORKDIR}/org"
 else
-	MY_P="${PN}-release_${PV}"
-
-	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	# git archive --prefix=${P}/ release_${PV} | xz > ${P}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
 fi
 
diff --git a/app-emacs/org-mode/org-mode-9.7.37.ebuild b/app-emacs/org-mode/org-mode-9.7.37.ebuild
index 005f6135d797..9ab8105fa722 100644
--- a/app-emacs/org-mode/org-mode-9.7.37.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.37.ebuild
@@ -15,11 +15,8 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
 	S="${WORKDIR}/org"
 else
-	MY_P="${PN}-release_${PV}"
-
-	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	# git archive --prefix=${P}/ release_${PV} | xz > ${P}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
diff --git a/app-emacs/org-mode/org-mode-9.7.38.ebuild b/app-emacs/org-mode/org-mode-9.7.38.ebuild
index 62007b56c10c..9f97c59fc7a3 100644
--- a/app-emacs/org-mode/org-mode-9.7.38.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.38.ebuild
@@ -15,11 +15,8 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
 	S="${WORKDIR}/org"
 else
-	MY_P="${PN}-release_${PV}"
-
-	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	# git archive --prefix=${P}/ release_${PV} | xz > ${P}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
diff --git a/app-emacs/org-mode/org-mode-9.7.39.ebuild b/app-emacs/org-mode/org-mode-9.7.39.ebuild
index 74b340ed0dcc..6e0bbf0ae670 100644
--- a/app-emacs/org-mode/org-mode-9.7.39.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.39.ebuild
@@ -15,11 +15,8 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
 	S="${WORKDIR}/org"
 else
-	MY_P="${PN}-release_${PV}"
-
-	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
+	# git archive --prefix=${P}/ release_${PV} | xz > ${P}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi