diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 4f12a637baf6..d8b18c0e4209 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -1,37 +1,36 @@
 PORTNAME=	zipcodes
-PORTVERSION=	20200831
+PORTVERSION=	20221228
 CATEGORIES=	japanese
-MASTER_SITES=	LOCAL/kuriyama
+MASTER_SITES=	LOCAL/hrs
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese zipcode tables. includes both 3/5 and 7 digits form
 WWW=		https://www.post.japanpost.jp/zipcode/
 
-BUILD_DEPENDS=	nkf:japanese/nkf
+LICENSE=	PD
 
-NO_WRKSUBDIR=	yes
+BUILD_DEPENDS=	nkf:japanese/nkf
 
 USES=		perl5 zip
 USE_PERL5=	build
-MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" SCRIPTDIR=${SCRIPTDIR} PERL=${PERL} STAGEDIR=${STAGEDIR}
+
+NO_WRKSUBDIR=	yes
+MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" \
+		SCRIPTDIR=${SCRIPTDIR} \
+		PERL=${PERL} \
+		STAGEDIR=${STAGEDIR}
+MAKEFILE=	${FILESDIR}/Makefile
+PLIST_FILES=	share/misc/jp-zipcodes/jigyosyo-euc.csv \
+		share/misc/jp-zipcodes/ken_all-euc.csv \
+		share/misc/jp-zipcodes/zipcodes.5digits \
+		share/misc/jp-zipcodes/zipcodes.7digits
 PORTVERSION_K?=	${PORTVERSION}
 PORTVERSION_J?=	${PORTVERSION}
 
 post-extract:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
-	cd ${WRKSRC}; ${MV} KEN_ALL.CSV ken_all.csv; ${MV} JIGYOSYO.CSV jigyosyo.csv
-
-# for maintenance.
-fetch1:
-	fetch http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
-	fetch http://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
-	${CHMOD} og+r *.zip
-
-fetch2:
-	m=`stat -f %m ken_all.zip`; \
-	${MV} ken_all.zip `date -r $${m} +ken_all-%Y%m%d.zip`
-	m=`stat -f %m jigyosyo.zip`; \
-	${MV} jigyosyo.zip `date -r $${m} +jigyosyo-%Y%m%d.zip`
+	cd ${WRKSRC} && \
+	    ${MV} KEN_ALL.CSV ken_all.csv && \
+	    ${MV} JIGYOSYO.CSV jigyosyo.csv
 
 .include <bsd.port.mk>
diff --git a/japanese/zipcodes/distinfo b/japanese/zipcodes/distinfo
index f80e53895a59..18b66d50c58d 100644
--- a/japanese/zipcodes/distinfo
+++ b/japanese/zipcodes/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1600309396
-SHA256 (ken_all-20200831.zip) = 8fc04ec597996d73947fe349bae83f15d25ed3ca668d66dbac88b20a477fafd7
-SIZE (ken_all-20200831.zip) = 1690594
-SHA256 (jigyosyo-20200831.zip) = 10982c635c484158a31add918eb760241bdfea87f2a2960810bde647be28afdf
-SIZE (jigyosyo-20200831.zip) = 768323
+TIMESTAMP = 1673182536
+SHA256 (ken_all-20221228.zip) = cfe8d51d3610ec20b40be7472a05afa2b92bd1e5e68c8b25871a4958d09a94ef
+SIZE (ken_all-20221228.zip) = 1691520
+SHA256 (jigyosyo-20221228.zip) = d5b07562130585778860d4e173c879c17d5246049e7d958f720e192b5dfd6a5d
+SIZE (jigyosyo-20221228.zip) = 773333
diff --git a/japanese/zipcodes/files/Makefile b/japanese/zipcodes/files/Makefile
index 79bfb8e617e5..99494d8afec0 100644
--- a/japanese/zipcodes/files/Makefile
+++ b/japanese/zipcodes/files/Makefile
@@ -1,37 +1,35 @@
 .SUFFIXES: .csv .euc-csv
 
 CSV=	ken_all.csv
 #CSV=	01hokkai.csv 02aomori.csv 03iwate.csv 04miyagi.csv \
 #	05akita.csv 06yamaga.csv 07fukush.csv 08ibarak.csv \
 #	09tochig.csv 10gumma.csv 11saitam.csv 12chiba.csv \
 #	13tokyo.csv 14kanaga.csv 15niigat.csv 16toyama.csv \
 #	17ishika.csv 18fukui.csv 19yamana.csv 20nagano.csv \
 #	21gifu.csv 22shizuo.csv 23aichi.csv 24mie.csv \
 #	25shiga.csv 26kyouto.csv 27osaka.csv 28hyogo.csv \
 #	29nara.csv 30wakaya.csv 31tottor.csv 32shiman.csv \
 #	33okayam.csv 34hirosh.csv 35yamagu.csv 36tokush.csv \
 #	37kagawa.csv 38ehime.csv 39kochi.csv 40fukuok.csv \
 #	41saga.csv 42nagasa.csv 43kumamo.csv 44oita.csv \
 #	45miyaza.csv 46kagosh.csv 47okinaw.csv
 EUCCSV=	${CSV:%.csv=%.euc-csv}
 PERL?=	/usr/bin/perl
 NKF?=	${LOCALBASE}/bin/nkf
 _DESTDIR=${STAGEDIR}${PREFIX}/share/misc/jp-zipcodes
 
 all:	zipcodes.5digits zipcodes.7digits
 
 install: zipcodes.5digits zipcodes.7digits jigyosyo.euc-csv
 	mkdir -p ${_DESTDIR}
-	for i in zipcodes.5digits zipcodes.7digits; do \
-		${INSTALL_DATA} $$i ${_DESTDIR}; \
-	done
+	${INSTALL_DATA} zipcodes.5digits zipcodes.7digits ${_DESTDIR}
 	${INSTALL_DATA} ken_all.euc-csv ${_DESTDIR}/ken_all-euc.csv
 	${INSTALL_DATA} jigyosyo.euc-csv ${_DESTDIR}/jigyosyo-euc.csv
 
 zipcodes.5digits: ${EUCCSV}
 	cat ${EUCCSV} | ${PERL} ${SCRIPTDIR}/genold.pl > zipcodes.5digits
 zipcodes.7digits: ${EUCCSV}
 	cat ${EUCCSV} | ${PERL} ${SCRIPTDIR}/gennew.pl > zipcodes.7digits
 
 .csv.euc-csv:
 	${NKF} -X -e < $*.csv > $*.euc-csv
diff --git a/japanese/zipcodes/pkg-plist b/japanese/zipcodes/pkg-plist
deleted file mode 100644
index 989b762f2ea9..000000000000
--- a/japanese/zipcodes/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-share/misc/jp-zipcodes/jigyosyo-euc.csv
-share/misc/jp-zipcodes/ken_all-euc.csv
-share/misc/jp-zipcodes/zipcodes.5digits
-share/misc/jp-zipcodes/zipcodes.7digits