diff --git a/devel/ga/Makefile b/devel/ga/Makefile
index 3256e1aa653a..9538aeb21cd2 100644
--- a/devel/ga/Makefile
+++ b/devel/ga/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	ga
-DISTVERSIONPREFIX=	v
-DISTVERSION=	5.8
+DISTVERSION=	5.8.1
+MASTER_SITES=	https://github.com/GlobalArrays/ga/releases/download/v${DISTVERSION}/
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partitioned Global Address Space (PGAS) library for distributed arrays
 
 LICENSE=	BMIL
 LICENSE_NAME=	Battelle Memorial Institute License
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libscalapack.so:math/scalapack
 
 USES=		autoreconf fortran gmake libtool localbase
-USE_GITHUB=	yes
-GH_ACCOUNT=	GlobalArrays
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-peigs --enable-shared --disable-static --with-blas4 --with-scalapack
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lscalapack
 
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # the default should be the same as for the MPI option in math/scalapack
 
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 
 OPENMPI_BUILD_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_CONFIGURE_ENV=		CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
 				CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ \
 				F77=${LOCALBASE}/mpi/openmpi/bin/mpif77 MPIF77=${LOCALBASE}/mpi/openmpi/bin/mpif77 \
 				FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 MPIFC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
 				LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib"
 OPENMPI_MAKE_ARGS=		FREEBSD_LINK_FLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -lmpi"
 
 .include <bsd.port.mk>
diff --git a/devel/ga/distinfo b/devel/ga/distinfo
index bc6c6e846b7a..10af755435aa 100644
--- a/devel/ga/distinfo
+++ b/devel/ga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604427102
-SHA256 (GlobalArrays-ga-v5.8_GH0.tar.gz) = 6a87aefca020408376b17ef6070295cddfa331cc2d095b05d588285f8ca9e8bc
-SIZE (GlobalArrays-ga-v5.8_GH0.tar.gz) = 5060111
+TIMESTAMP = 1643221874
+SHA256 (ga-5.8.1.tar.gz) = 844639b52444f839854cf9735203a76a9052fd485f2d4eae70d21d03a7ecaade
+SIZE (ga-5.8.1.tar.gz) = 6492890