diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 0d7d53a0a2fb..19a30193272f 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -1,53 +1,53 @@
 # Created by: dwm
 
 PORTNAME=	icu
-DISTVERSIONPREFIX=	release-
-DISTVERSION=	71-1
+DISTVERSION=	71_1
 PORTREVISION?=	0 # 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
-USE_GITHUB=	yes
-GH_ACCOUNT=	unicode-org
-WRKSRC_SUBDIR=	icu4c/source
+WRKSRC=		${WRKDIR}/icu/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 7bb5def493f6..70c4436bf07c 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1648673391
-SHA256 (unicode-org-icu-release-71-1_GH0.tar.gz) = d88a4ea7a4a28b445bb073a6cfeb2a296bf49a4a2fe5f1b49f87ecb4fc55c51d
-SIZE (unicode-org-icu-release-71-1_GH0.tar.gz) = 66177851
+SHA256 (icu4c-71_1-src.tgz) = 67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
+SIZE (icu4c-71_1-src.tgz) = 25701340