diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 171237e86320..4b2fb824786b 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -1,53 +1,53 @@
 # Created by: dwm
 
 PORTNAME=	icu
-DISTVERSION=	70_1
+DISTVERSIONPREFIX=	release-
+DISTVERSION=	70-1
 PORTREVISION?=	1 # keep for icu-lx
 PORTEPOCH?=	1
 CATEGORIES?=	devel
-MASTER_SITES=	https://github.com/unicode-org/${PORTNAME}/releases/download/release-${DISTVERSION:S/rc/-&/:S/_/-/g}/ \
-		SF/${PORTNAME}/${PORTNAME:tu}4C/${PORTVERSION}
-DISTNAME=	icu4c-${DISTVERSION}-src
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT?=	International Components for Unicode (from IBM)
 
 LICENSE=	ICU
 LICENSE_NAME=	ICU license
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES+=		compiler:c++11-lib cpe gmake pathfix python:build tar:tgz
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-layoutex
 CONFIGURE_ARGS+=--with-data-packaging=archive \
 		--disable-renaming \
 		--disable-samples \
 		--enable-static
 CPPFLAGS+=	-DICU_NO_USER_DATA_OVERRIDE
 MAKE_ARGS=	VERBOSE=1
 TEST_TARGET=	check
 CPE_VENDOR=	${PORTNAME}-project
 CPE_PRODUCT=	international_components_for_unicode
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/icu/source
+USE_GITHUB=	yes
+GH_ACCOUNT=	unicode-org
+WRKSRC_SUBDIR=	icu4c/source
 
 ICUMAJOR=	${PORTVERSION:C/\..*//}
 PLIST_SUB+=	ICUMAJOR=${ICUMAJOR} ICUVER=${PORTVERSION:C/r.?/1/}
 
 .ifndef PKGNAMESUFFIX
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
 		${STAGEDIR}${PREFIX}/bin/*conv \
 		${STAGEDIR}${PREFIX}/bin/icuexportdata \
 		${STAGEDIR}${PREFIX}/bin/icuinfo \
 		${STAGEDIR}${PREFIX}/bin/derb \
 		${STAGEDIR}${PREFIX}/bin/pkgdata
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
 # Filename varies by endianness: icudt<major>b.dat vs. icudt<major>l.dat
 	@(cd ${STAGEDIR}${PREFIX} && ${ECHO_CMD} \
 		${DATADIR_REL}/${PORTVERSION:C/r.?/1/}/icudt*.dat >>${TMPPLIST})
 .endif # PKGNAMESUFFIX
 
 .include <bsd.port.mk>
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 8121b7c5f3bc..3380e01827c1 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1635437097
-SHA256 (icu4c-70_1-src.tgz) = 8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
-SIZE (icu4c-70_1-src.tgz) = 25449582
+SHA256 (unicode-org-icu-release-70-1_GH0.tar.gz) = f30d670bdc03ba999638a2d2511952ab94adf204d0e14898666f2e0cacb7fef1
+SIZE (unicode-org-icu-release-70-1_GH0.tar.gz) = 65661187