diff --git a/biology/ncbi-cxx-toolkit/Makefile b/biology/ncbi-cxx-toolkit/Makefile
index 40f24bc66bed..2fc85bad7d51 100644
--- a/biology/ncbi-cxx-toolkit/Makefile
+++ b/biology/ncbi-cxx-toolkit/Makefile
@@ -1,48 +1,45 @@
 PORTNAME=	ncbi-cxx-toolkit
-DISTVERSION=	25_2_0
+DISTVERSIONPREFIX=	release-
+DISTVERSION=	26.0.1
 CATEGORIES=	biology science devel
-MASTER_SITES=	ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2021/Sep_30_2021/
-DISTNAME=	ncbi_cxx--${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	NCBI C++ Toolkit
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/doc/public/LICENSE
 
 LIB_DEPENDS=	libcdd.so:math/cddlib \
 		liblmdb.so:databases/lmdb \
 		libpcre.so:devel/pcre
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++14-lang gmake mysql perl5 python shebangfix ssl xorg
+USES=		compiler:c++17-lang gmake mysql perl5 python shebangfix ssl xorg
 USE_XORG=	x11 xpm
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	ncbi
+GH_PROJECT=	${PORTNAME}-public
+
 SHEBANG_FILES=	src/app/blast/get_species_taxids.sh
 SHEBANG_GLOB=	*.pl *.py
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-debug --with-dll --without-static \
 		--without-vdb
 
 CONFLICTS_INSTALL=	ncbi-blast+
 
 post-install:
 	# strip
 	@${FIND} ${STAGEDIR}${PREFIX}/bin -type f | ${GREP} -v -E '\.(sh|py|pl)$$' | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.so" | ${XARGS} ${STRIP_CMD}
-	# remove an empty directory
-	#@${RMDIR} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/objtools/data_loaders/genbank/psg
-	@${RMDIR} \
-		${STAGEDIR}${PREFIX}/include/ncbi-tools++/algo/ms/formats \
-		${STAGEDIR}${PREFIX}/include/ncbi-tools++/algo/ms
-	# remove the conflicting file
+	# remove the conflicting files
 	@${RM} \
 		${STAGEDIR}${PREFIX}/lib/libcdd.so \
 		${STAGEDIR}${PREFIX}/lib/liblmdb.so
 	# autoplist: thousands of files
 	@cd ${STAGEDIR}${PREFIX} && \
-		${RMDIR} include/ncbi-tools++/algo/blast/bl2api include/ncbi-tools++/objtools/test && \
 		${FIND} * -type f -or -type l >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/biology/ncbi-cxx-toolkit/distinfo b/biology/ncbi-cxx-toolkit/distinfo
index 68a69535957e..af7c94b0fa38 100644
--- a/biology/ncbi-cxx-toolkit/distinfo
+++ b/biology/ncbi-cxx-toolkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633054572
-SHA256 (ncbi_cxx--25_2_0.tar.gz) = 9f824a92750e64e7b9be98d82b84414ab4f7e5d73392dadbb87c94ff5ccf9111
-SIZE (ncbi_cxx--25_2_0.tar.gz) = 95671156
+TIMESTAMP = 1643225773
+SHA256 (ncbi-ncbi-cxx-toolkit-public-release-26.0.1_GH0.tar.gz) = aba79da5c8d0407ffc92b7831f4f8f8a8096a15e47a016ada81b6568f9d280cc
+SIZE (ncbi-ncbi-cxx-toolkit-public-release-26.0.1_GH0.tar.gz) = 103933829