diff --git a/chinese/rime-luna-pinyin/Makefile b/chinese/rime-luna-pinyin/Makefile
index 667fe847882b..2536368e4d1f 100644
--- a/chinese/rime-luna-pinyin/Makefile
+++ b/chinese/rime-luna-pinyin/Makefile
@@ -1,61 +1,61 @@
 # Created by: Ka Ho Ng <khng300@gmail.com>
 
 PORTNAME=	rime-luna-pinyin
-DISTVERSION=	g20210303
+DISTVERSION=	g20210805
 CATEGORIES=	chinese textproc
 
-MAINTAINER=	khng300@gmail.com
+MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Rime Luna Pinyin schema support
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	\
 		rime_deployer:chinese/librime \
 		zh-rime-essay>g0:chinese/rime-essay \
 		zh-rime-prelude>g0:chinese/rime-prelude
 RUN_DEPENDS=	zh-rime-prelude>g0:chinese/rime-prelude
 
 USES=		localbase
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rime
-GH_TAGNAME=	c7c380d4da10d1aba538d084016147bd5e1997fa
+GH_TAGNAME=	6e677427764b542313858eaed22c2951d8ec22fe
 
 NO_ARCH=	yes
 
 PORTDOCS=	AUTHORS README.md
 
 PRELUDE_FILES=	default.yaml key_bindings.yaml punctuation.yaml symbols.yaml
 ESSAY_FILES=	essay.txt
 SCHEMA_FILES=	luna_pinyin_fluency.schema.yaml	\
 		luna_pinyin_simp.schema.yaml	\
 		luna_pinyin_tw.schema.yaml	\
 		luna_pinyin.schema.yaml		\
 		luna_quanpin.schema.yaml
 MY_OUTDIR=	${WRKDIR}/out
 
 do-build:
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES}
 	@${CP} ${LOCALBASE}/share/rime-data/${i} ${MY_OUTDIR}
 .endfor
 .for i in ${SCHEMA_FILES}
 	rime_deployer --compile ${WRKSRC}/${i} ${MY_OUTDIR}
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/rime-data
 	${INSTALL_DATA} ${WRKSRC}/*.yaml ${STAGEDIR}${PREFIX}/share/rime-data
 	(cd ${MY_OUTDIR} && ${COPYTREE_SHARE} build ${STAGEDIR}${PREFIX}/share/rime-data)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/AUTHORS ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/chinese/rime-luna-pinyin/distinfo b/chinese/rime-luna-pinyin/distinfo
index 7db36f5a09e6..e4777cdf1654 100644
--- a/chinese/rime-luna-pinyin/distinfo
+++ b/chinese/rime-luna-pinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615223007
-SHA256 (rime-rime-luna-pinyin-g20210303-c7c380d4da10d1aba538d084016147bd5e1997fa_GH0.tar.gz) = 8f6c764d7b196d7d84b5b911c48bbec434cae554cd4e4a7e7186bbdd20a0e73f
-SIZE (rime-rime-luna-pinyin-g20210303-c7c380d4da10d1aba538d084016147bd5e1997fa_GH0.tar.gz) = 395435
+TIMESTAMP = 1638227221
+SHA256 (rime-rime-luna-pinyin-g20210805-6e677427764b542313858eaed22c2951d8ec22fe_GH0.tar.gz) = 85521a4eb79da65445d332fbe5001f85d06c7eb4894385f0b2ffa81c9a6441ef
+SIZE (rime-rime-luna-pinyin-g20210805-6e677427764b542313858eaed22c2951d8ec22fe_GH0.tar.gz) = 395442