Index: head/devel/riscv64-gcc/Makefile
===================================================================
--- head/devel/riscv64-gcc/Makefile
+++ head/devel/riscv64-gcc/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	8.1.0
-PORTREVISION=	1
+PORTVERSION=	8.3.0
 CATEGORIES=	devel
+MASTER_SITES=	GCC
 PKGNAMEPREFIX=	riscv64-
 
 MAINTAINER=	lwhsu@FreeBSD.org
@@ -18,15 +18,10 @@
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
 
-USES=	iconv gmake libtool makeinfo
+USES=	iconv gmake libtool makeinfo tar:xz
 
 USE_LDCONFIG=	yes
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	freebsd-riscv
-GH_PROJECT=	riscv-gcc
-GH_TAGNAME=	7a5a908
-
 GCC_TARGET=	${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}
 
 GNU_CONFIGURE=	yes
@@ -38,9 +33,8 @@
 		--without-headers \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
 		--with-system-zlib \
-		--with-as=${LOCALBASE}/bin/${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}-as \
-		--with-ld=${LOCALBASE}/bin/${PKGNAMEPREFIX}unknown-${OPSYS:tl}${OSREL}-ld \
-		--disable-werror \
+		--with-as=${LOCALBASE}/bin/${GCC_TARGET}-as \
+		--with-ld=${LOCALBASE}/bin/${GCC_TARGET}-ld \
 		--enable-threads \
 		--enable-tls \
 		--enable-languages=c,c++ \
Index: head/devel/riscv64-gcc/distinfo
===================================================================
--- head/devel/riscv64-gcc/distinfo
+++ head/devel/riscv64-gcc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538090164
-SHA256 (freebsd-riscv-riscv-gcc-8.1.0-7a5a908_GH0.tar.gz) = 8c23b101d42bdb25b3863d397d532a2ea8af87974a9ba1f2ac359eaf738e9358
-SIZE (freebsd-riscv-riscv-gcc-8.1.0-7a5a908_GH0.tar.gz) = 102349687
+TIMESTAMP = 1571467794
+SHA256 (gcc-8.3.0.tar.xz) = 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+SIZE (gcc-8.3.0.tar.xz) = 63694700