diff --git a/chinese/rime-combo-pinyin/Makefile b/chinese/rime-combo-pinyin/Makefile
index ddfaa2537c93..a5ca8592f06e 100644
--- a/chinese/rime-combo-pinyin/Makefile
+++ b/chinese/rime-combo-pinyin/Makefile
@@ -1,62 +1,62 @@
 # Created by: Ka Ho Ng <khng300@gmail.com>
 
 PORTNAME=	rime-combo-pinyin
-DISTVERSION=	g20210131
+DISTVERSION=	g20211108
 CATEGORIES=	chinese textproc
 
-MAINTAINER=	khng300@gmail.com
+MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Rime Combo Pinyin schema support
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rime_deployer:chinese/librime	\
 		zh-rime-essay>g0:chinese/rime-essay \
 		zh-rime-prelude>g0:chinese/rime-prelude \
 		zh-rime-luna-pinyin>g0:chinese/rime-luna-pinyin
 RUN_DEPENDS=	zh-rime-prelude>g0:chinese/rime-prelude \
 		zh-rime-luna-pinyin>g0:chinese/rime-luna-pinyin
 
 USES=		localbase
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rime
-GH_TAGNAME=	a84065a86b272c76215215bd6f03c506b6e7097c
+GH_TAGNAME=	c9d8aca2fbc50ccab419d54cb9aaded362c1029d
 
 NO_ARCH=	yes
 
 PORTDOCS=	AUTHORS README.md
 
 PRELUDE_FILES=	default.yaml key_bindings.yaml punctuation.yaml symbols.yaml
 ESSAY_FILES=	essay.txt
 LUNA_PINYIN_FILES=	luna_pinyin.dict.yaml
 SCHEMA_FILES=	combo_pinyin.schema.yaml combo_pinyin_kbcon.schema.yaml \
 		combo_pinyin_left.schema.yaml
 MY_OUTDIR=	${WRKDIR}/out
 
 do-build:
 	@${MKDIR} ${MY_OUTDIR}
 	@${RLN} ${WRKSRC}/* ${MY_OUTDIR}
 .for i in ${PRELUDE_FILES} ${ESSAY_FILES} ${LUNA_PINYIN_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
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/rime-data/build
 	${INSTALL_DATA} ${WRKSRC}/*.yaml ${STAGEDIR}${PREFIX}/share/rime-data
 	${INSTALL_DATA} ${MY_OUTDIR}/build/combo_pinyin* \
 		${STAGEDIR}${PREFIX}/share/rime-data/build
 
 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-combo-pinyin/distinfo b/chinese/rime-combo-pinyin/distinfo
index 540c943982e9..114c7d325a89 100644
--- a/chinese/rime-combo-pinyin/distinfo
+++ b/chinese/rime-combo-pinyin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615217120
-SHA256 (rime-rime-combo-pinyin-g20210131-a84065a86b272c76215215bd6f03c506b6e7097c_GH0.tar.gz) = 5121732d28168fe7cf724c728ae4095f4bd003c7236f048c0ca629708aa8a69e
-SIZE (rime-rime-combo-pinyin-g20210131-a84065a86b272c76215215bd6f03c506b6e7097c_GH0.tar.gz) = 17749
+TIMESTAMP = 1638227217
+SHA256 (rime-rime-combo-pinyin-g20211108-c9d8aca2fbc50ccab419d54cb9aaded362c1029d_GH0.tar.gz) = 8255fbd4fd5a31b4c1d3ddc349a276f58325a48333c075d56aa57ba266f25819
+SIZE (rime-rime-combo-pinyin-g20211108-c9d8aca2fbc50ccab419d54cb9aaded362c1029d_GH0.tar.gz) = 18693
diff --git a/chinese/rime-combo-pinyin/pkg-plist b/chinese/rime-combo-pinyin/pkg-plist
index 7bb411edba15..3a8922f908d9 100644
--- a/chinese/rime-combo-pinyin/pkg-plist
+++ b/chinese/rime-combo-pinyin/pkg-plist
@@ -1,10 +1,9 @@
 share/rime-data/build/combo_pinyin.prism.bin
+share/rime-data/build/combo_pinyin.prism.txt
 share/rime-data/build/combo_pinyin.schema.yaml
-share/rime-data/build/combo_pinyin_kbcon.prism.bin
 share/rime-data/build/combo_pinyin_kbcon.schema.yaml
-share/rime-data/build/combo_pinyin_left.prism.bin
 share/rime-data/build/combo_pinyin_left.schema.yaml
 share/rime-data/combo_pinyin.schema.yaml
-share/rime-data/combo_pinyin_kbcon.options.yaml
 share/rime-data/combo_pinyin_kbcon.schema.yaml
+share/rime-data/combo_pinyin_layouts.yaml
 share/rime-data/combo_pinyin_left.schema.yaml