diff --git a/devel/ccls/Makefile b/devel/ccls/Makefile
index bbc9f8fa0ab5..b30f30db5c24 100644
--- a/devel/ccls/Makefile
+++ b/devel/ccls/Makefile
@@ -1,35 +1,56 @@
 PORTNAME=	ccls
-DISTVERSION=	0.20201219
+DISTVERSION=	0.20210330
 CATEGORIES=	devel
 
-MAINTAINER=	khng300@gmail.com
+MAINTAINER=	khng@FreeBSD.org
 COMMENT=	C/C++/ObjC language server
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rapidjson>=1.1.0_4:devel/rapidjson
 LIB_DEPENDS=	libclang-cpp.so:devel/llvm${LLVM_DEFAULT}
 
 USES=		cmake compiler:c++17-lang localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	MaskRay
 
 CMAKE_ARGS=	-DCCLS_VERSION:STRING="${DISTVERSION}" \
 		-DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \
 		-DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm"
 CXXFLAGS+=	-DNDEBUG
 
 PLIST_FILES=	bin/ccls
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_MASTER_SITES=	LOCAL/tobik:docs
-DOCS_DISTFILES=		MaskRay-ccls.wiki-20190903.tar.gz:docs
+DOCS_MASTER_SITES=	LOCAL/khng:docs
+DOCS_DISTFILES=		ccls.wiki-${DISTVERSION}.tar.gz:docs
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/ccls.wiki && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
+.if defined(MAINTAINER_MODE)
+MAINTAINER_DISTFILE=	\
+	${_DISTDIR:S|/$||}/${DOCS_DISTFILES:Mccls.wiki-*.tar.gz\:*:C|\:.*$||}
+
+maintainer-docs-fetch:
+	@${MAKE} clean
+	@${MKDIR} ${WRKDIR}/ccls.wiki
+	@git clone https://github.com/MaskRay/ccls.wiki.git \
+		${WRKDIR}/ccls.wiki
+	@${TAR} -zcf ${MAINTAINER_DISTFILE} -C ${WRKDIR} \
+		--uid 0 --gid 0 --exclude-vcs ccls.wiki
+	@${MAKE} makesum
+	@${MAKE} clean
+
+${MAINTAINER_DISTFILE}: maintainer-docs-fetch
+
+maintainer-docs-distfiles: ${MAINTAINER_DISTFILE}
+	scp ${MAINTAINER_DISTFILE} \
+	    freefall.freebsd.org:public_distfiles/
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/ccls/distinfo b/devel/ccls/distinfo
index 912b4737979a..c4c9687f89bb 100644
--- a/devel/ccls/distinfo
+++ b/devel/ccls/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1609391939
-SHA256 (MaskRay-ccls.wiki-20190903.tar.gz) = da8d2ed4464ca445001eb2b22439ab265314ad8cf86b4b9509ac8a6a19c481e8
-SIZE (MaskRay-ccls.wiki-20190903.tar.gz) = 32080
-SHA256 (MaskRay-ccls-0.20201219_GH0.tar.gz) = edd3435bc7e55d9e5dc931932f9c98275a6a28d1ab1f66416110e029f3f2882a
-SIZE (MaskRay-ccls-0.20201219_GH0.tar.gz) = 160445
+TIMESTAMP = 1617705972
+SHA256 (ccls.wiki-0.20210330.tar.gz) = 100af2f2446f20e64a5f54e71b598a4a24abd098a7722bdc132cd8a91f7ce6fd
+SIZE (ccls.wiki-0.20210330.tar.gz) = 36740
+SHA256 (MaskRay-ccls-0.20210330_GH0.tar.gz) = 28c228f49dfc0f23cb5d581b7de35792648f32c39f4ca35f68ff8c9cb5ce56c2
+SIZE (MaskRay-ccls-0.20210330_GH0.tar.gz) = 160487