diff --git a/devel/libbson/Makefile b/devel/libbson/Makefile
index f508aaed2b55..5360d7848d96 100644
--- a/devel/libbson/Makefile
+++ b/devel/libbson/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	libbson
 DISTVERSION=	1.25.3
 CATEGORIES=	devel
-MASTER_SITES=	https://codeload.github.com/mongodb/${PORTNAME}/tar.gz/${DISTVERSION}?dummy=/
-DISTNAME=	mongo-c-driver-${DISTVERSION}
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	BSON utility library
 WWW=		https://github.com/mongodb/mongo-c-driver
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cmake cpe pathfix python:env pkgconfig
+USES=		cmake cpe python:env pkgconfig
 CPE_VENDOR=	mongodb
 USE_LDCONFIG=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	mongodb
+GH_PROJECT=	mongo-c-driver
+
 DOCSDIR=	${PREFIX}/share/doc/mongo-c-driver
 
 CMAKE_OFF=	BUILD_TESTING \
 		ENABLE_EXAMPLES \
 		ENABLE_ICU \
 		ENABLE_MONGOC \
 		ENABLE_TESTS \
 		ENABLE_UNINSTALL \
 		ENABLE_ZLIB \
 		ENABLE_ZSTD
 CMAKE_ARGS=	-DBSON_HAVE_STRINGS_H=0
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR}
 DOCS_CMAKE_ON=		-DENABLE_HTML_DOCS=ON -DENABLE_MAN_PAGES=ON
 
 post-extract:
 	${ECHO} "${DISTVERSION}" > ${WRKSRC}/VERSION_CURRENT
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/mongo-c-driver
 
 .include <bsd.port.mk>
diff --git a/devel/libbson/distinfo b/devel/libbson/distinfo
index a4e44411fab8..a4325e89660b 100644
--- a/devel/libbson/distinfo
+++ b/devel/libbson/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703795554
-SHA256 (mongo-c-driver-1.25.3.tar.gz) = d7cdedc5164b7b8ca39bb45bee789da44097052c882fa84996e4d90eec6fe8d3
-SIZE (mongo-c-driver-1.25.3.tar.gz) = 7306922
+TIMESTAMP = 1704140351
+SHA256 (mongodb-mongo-c-driver-1.25.3_GH0.tar.gz) = d7cdedc5164b7b8ca39bb45bee789da44097052c882fa84996e4d90eec6fe8d3
+SIZE (mongodb-mongo-c-driver-1.25.3_GH0.tar.gz) = 7306922