diff --git a/biology/linux-foldingathome/Makefile b/biology/linux-foldingathome/Makefile
index db870ea430ca..7df5db1a03c8 100644
--- a/biology/linux-foldingathome/Makefile
+++ b/biology/linux-foldingathome/Makefile
@@ -1,72 +1,69 @@
 PORTNAME=	foldingathome
 DISTVERSION=	8.4.9
 CATEGORIES=	biology linux
-MASTER_SITES=	${_MASTER_SITES}
+MASTER_SITES=	https://download.foldingathome.org/releases/public/fah-client/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	fah-client_${DISTVERSION}-64bit-release
-DISTFILES=	${_DISTFILES}
+DISTNAME=	${_DISTNAME_${ARCH}}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Folding@home Client
 WWW=		https://foldingathome.org/
 
 # Distribution without permission is prohibited
 LICENSE=	FAHSL
 LICENSE_NAME=	Folding@home Software License
 LICENSE_FILE=	${WRKSRC}/${DISTNAME}/LICENSE
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell \
 		auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	has not been ported to this architecture
 
 USES=		linux:rl9 tar:bz2
 USE_LINUX=	systemd-libs
 USE_RC_SUBR=	fahclient
 
 ETCDIR=		${PREFIX}/etc/fahclient
 DOCSDIR=	${PREFIX}/share/doc/fahclient
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	FAHCLIENT_CONFIG_XML=${_FAHCLIENT_CONFIG_XML} \
 		FAHCLIENT_PROGRAM=${_FAHCLIENT_PROGRAM} \
 		FAHCLIENT_WORK_DIR=${_FAHCLIENT_WORK_DIR}
 NO_WRKSUBDIR=	yes
 
 USERS=		fahclient
 GROUPS=		fahclient
 
 PLIST_SUB=	FAHCLIENT_WORK_DIR=${_FAHCLIENT_WORK_DIR}
 
 PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
 _FAHCLIENT_CONFIG_XML=	${ETCDIR}/config.xml
 _FAHCLIENT_WORK_DIR=	/var/db/fahclient
 _FAHCLIENT_PROGRAM=	${PREFIX}/bin/fah-client
 
-_MASTER_SITES_amd64=	https://download.foldingathome.org/releases/public/fah-client/debian-10-64bit/release/
-_MASTER_SITES_aarch64=	https://download.foldingathome.org/releases/public/fah-client/debian-stable-arm64/release/
+# The base name of the distribution file is the same for all supported
+# architectures, so we need to work around that in a creative way.
+_DISTNAME_amd64=	debian-10-64bit/release/fah-client_${DISTVERSION}-64bit-release
+_DISTNAME_aarch64=	debian-stable-arm64/release/fah-client_${DISTVERSION}-64bit-release
 .if make(makesum)
-_MASTER_SITES=		${ONLY_FOR_ARCHS:@.ARCH.@${_MASTER_SITES_${.ARCH.}}@}
-_DISTFILES=		${ONLY_FOR_ARCHS:@.ARCH.@${DISTNAME}${EXTRACT_SUFX}?a=${.ARCH.}@}
-.else
-_MASTER_SITES=		${_MASTER_SITES_${ARCH}}
-_DISTFILES=		${DISTNAME}${EXTRACT_SUFX}?a=${ARCH}
+DISTFILES=		${ONLY_FOR_ARCHS:@.ARCH.@${_DISTNAME_${.ARCH.}}${EXTRACT_SUFX}@}
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME}/fah-client ${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/config.xml.sample \
 		${STAGEDIR}${_FAHCLIENT_CONFIG_XML}.sample
 	@${MKDIR} ${STAGEDIR}${_FAHCLIENT_WORK_DIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/${DISTNAME}/|} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/biology/linux-foldingathome/distinfo b/biology/linux-foldingathome/distinfo
index a66f1eafad98..8db90e6fd74a 100644
--- a/biology/linux-foldingathome/distinfo
+++ b/biology/linux-foldingathome/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1755706532
-SHA256 (fah-client_8.4.9-64bit-release.tar.bz2?a=aarch64) = 14ea352a42be0d34a1a0e2a4b46139e03d619a56bdd4908faaa56dc2665fcf3b
-SIZE (fah-client_8.4.9-64bit-release.tar.bz2?a=aarch64) = 3667080
-SHA256 (fah-client_8.4.9-64bit-release.tar.bz2?a=amd64) = 14ea352a42be0d34a1a0e2a4b46139e03d619a56bdd4908faaa56dc2665fcf3b
-SIZE (fah-client_8.4.9-64bit-release.tar.bz2?a=amd64) = 3667080
-SHA256 (fah-client_8.4.9-64bit-release.tar.bz2?a=aarch64) = 14ea352a42be0d34a1a0e2a4b46139e03d619a56bdd4908faaa56dc2665fcf3b
-SIZE (fah-client_8.4.9-64bit-release.tar.bz2?a=aarch64) = 3667080
-SHA256 (fah-client_8.4.9-64bit-release.tar.bz2?a=amd64) = 14ea352a42be0d34a1a0e2a4b46139e03d619a56bdd4908faaa56dc2665fcf3b
-SIZE (fah-client_8.4.9-64bit-release.tar.bz2?a=amd64) = 3667080
+TIMESTAMP = 1755790886
+SHA256 (debian-stable-arm64/release/fah-client_8.4.9-64bit-release.tar.bz2) = 14ea352a42be0d34a1a0e2a4b46139e03d619a56bdd4908faaa56dc2665fcf3b
+SIZE (debian-stable-arm64/release/fah-client_8.4.9-64bit-release.tar.bz2) = 3667080
+SHA256 (debian-10-64bit/release/fah-client_8.4.9-64bit-release.tar.bz2) = 2acccbeda05649f6f913d29f91a22308e88ec3e117499f636a18dc56244d6cf1
+SIZE (debian-10-64bit/release/fah-client_8.4.9-64bit-release.tar.bz2) = 3649371