diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	freenginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/osa
@@ -283,11 +283,6 @@
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
-post-patch-GRIDFS-on:
-	@${REINPLACE_CMD} -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \
-		-e 's!%%MONGOC_VERSION%%!${MONGOC_VERSION}!g' \
-		${WRKSRC_gridfs}/nginx-gridfs/config
-
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
diff --git a/www/freenginx-devel/Makefile.extmod b/www/freenginx-devel/Makefile.extmod
--- a/www/freenginx-devel/Makefile.extmod
+++ b/www/freenginx-devel/Makefile.extmod
@@ -72,10 +72,10 @@
 GRIDFS_GH_TUPLE=	nieoding:nginx-gridfs:059bdc3:gridfs
 GRIDFS_LIB_DEPENDS=	libbson2.so:devel/libbson \
 			libmongoc2.so:devel/mongo-c-driver
+GRIDFS_USES=		pkgconfig
 GRIDFS_VARS=		DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs
-MONGOC_VERSION!=	cd ${.CURDIR}/../../devel/mongo-c-driver; make -V DISTVERSION
 GRIDFS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-gridfs_config \
-			${PATCHDIR}/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c
+			${PATCHDIR}/extra-patch-nginx-gridfs_ngx_http_gridfs_module.c
 
 HEADERS_MORE_GH_TUPLE=		openresty:headers-more-nginx-module:v0.39:headers_more
 HEADERS_MORE_VARS=		DSO_EXTMODS+=headers_more
diff --git a/www/freenginx-devel/files/extra-patch-nginx-gridfs_config b/www/freenginx-devel/files/extra-patch-nginx-gridfs_config
--- a/www/freenginx-devel/files/extra-patch-nginx-gridfs_config
+++ b/www/freenginx-devel/files/extra-patch-nginx-gridfs_config
@@ -5,8 +5,8 @@
  ngx_module_name=ngx_http_gridfs_module
 -ngx_module_incs="/usr/include/libmongoc-1.0 /usr/include/libbson-1.0"
 -ngx_module_libs="-lmongoc-1.0 -lbson-1.0"
-+ngx_module_incs="%%LOCALBASE%%/include/mongoc-%%MONGOC_VERSION%% %%LOCALBASE%%/include/bson-%%MONGOC_VERSION%%"
-+ngx_module_libs="-lmongoc2 -lbson2"
++ngx_module_incs=`pkg-config --cflags-only-I mongoc2 bson2 | sed -e 's/-I//g'`
++ngx_module_libs=`pkg-config --libs mongoc2 bson2`
  ngx_module_srcs="$ngx_addon_dir/ngx_http_gridfs_module.c"
  . auto/module
 -ngx_addon_name=$ngx_module_name
diff --git a/www/freenginx-devel/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c b/www/freenginx-devel/files/extra-patch-nginx-gridfs_ngx_http_gridfs_module.c
rename from www/freenginx-devel/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c
rename to www/freenginx-devel/files/extra-patch-nginx-gridfs_ngx_http_gridfs_module.c
--- a/www/freenginx-devel/files/extra-patch-ngnx-gridfs_ngx_http_gridfs_module.c
+++ b/www/freenginx-devel/files/extra-patch-nginx-gridfs_ngx_http_gridfs_module.c
@@ -1,11 +1,12 @@
 --- ../nginx-gridfs-059bdc3/nginx-gridfs/ngx_http_gridfs_module.c.orig	2018-01-20 07:53:32.000000000 +0000
 +++ ../nginx-gridfs-059bdc3/nginx-gridfs/ngx_http_gridfs_module.c	2026-07-07 14:27:08.501699000 +0000
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,8 @@
  #include <ngx_config.h>
  #include <ngx_core.h>
  #include <ngx_http.h>
 -#include <mongoc.h>
 +#include <mongoc/mongoc.h>
++#include <assert.h>
  #include <signal.h>
  #include <stdio.h>