diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index c4e075a56175..e7a5373411d6 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,45 +1,44 @@
 PORTNAME=	aom
-DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.1
 PORTREVISION=	1
 CATEGORIES=	multimedia
+MASTER_SITES=	https://storage.googleapis.com/${PORTNAME}-releases/
+DISTNAME=	lib${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 WWW=		https://aomedia.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		cmake compiler:c++11-lib perl5
-USE_GITHUB=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
-GH_ACCOUNT=	jbeich # mirror
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	ENABLE_DOCS ENABLE_TESTS
 
 OPTIONS_DEFINE=	JXL VMAF
 OPTIONS_DEFAULT=JXL VMAF
 OPTIONS_EXCLUDE=JXL # https://bugs.chromium.org/p/aomedia/issues/detail?id=3457
 
 JXL_DESC=		Encoding tuning for Butteraugli
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_USES=		pkgconfig
 JXL_CMAKE_ON=		-DCONFIG_TUNE_BUTTERAUGLI:STRING=1
 
 VMAF_DESC=		Encoding tuning for VMAF
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_USES=		pkgconfig
 VMAF_CMAKE_ON=		-DCONFIG_TUNE_VMAF:STRING=1
 
 post-patch:
 # Extract (snapshot) version from the port instead of CHANGELOG
 	@${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \
 		${WRKSRC}/build/cmake/version.cmake
 
 .include <bsd.port.mk>
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 87e00adea323..3899f21be2a9 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1705523068
-SHA256 (jbeich-aom-v3.8.1_GH0.tar.gz) = 629d0fbd58654167d28f3efc2cdff0e708d68280aa5b30f81744e7e181a8d851
-SIZE (jbeich-aom-v3.8.1_GH0.tar.gz) = 5461300
+SHA256 (libaom-3.8.1.tar.gz) = dedc65060812a7df801c0270a2fe8bd773c6bb0b601f2144ecfbc62dc0f671ca
+SIZE (libaom-3.8.1.tar.gz) = 5450909