diff --git a/www/varnish-libvmod-querystring/Makefile b/www/varnish-libvmod-querystring/Makefile
index 6ede73062275..2837dcb101b6 100644
--- a/www/varnish-libvmod-querystring/Makefile
+++ b/www/varnish-libvmod-querystring/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	libvmod-querystring
 DISTVERSION=	v2.0.2
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	varnish-
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Varnish Module (vmod) for query string manipulation
 
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR}
 
 USES=		autoreconf libtool pkgconfig python:3.5+,build varnish:6
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
 DOCSDIR=	${PREFIX}/share/doc/vmod-querystring
 
 CFLAGS+=	-I${WRKSRC}/src
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Dridi
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} 's|$${VARNISHAPI_DATAROOTDIR}|${LOCALBASE}/share|' \
 		${WRKSRC}/Makefile.am
 
 post-build:
 	(cd ${WRKSRC}/src && ${LOCALBASE}/bin/rst2man \
 		vmod_querystring.man.rst vmod_querystring.3)
 
 .include <bsd.port.mk>
diff --git a/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c b/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c
new file mode 100644
index 000000000000..8287e1d791d9
--- /dev/null
+++ b/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c
@@ -0,0 +1,29 @@
+--- src/vmod_querystring.c.orig	2020-09-21 14:52:07 UTC
++++ src/vmod_querystring.c
+@@ -208,6 +208,17 @@ qs_match_regex(VRT_CTX, const struct qs_
+ 	return (VRT_re_match(ctx, s, qsf->ptr));
+ }
+ 
++static void
++qs_free_regex(void *priv)
++{
++	vre_t *re;
++
++	AN(priv);
++	re = priv;
++	VRE_free(&re);
++	AZ(re);
++}
++
+ static int
+ qs_match_glob(VRT_CTX, const struct qs_filter *qsf, const char *s,
+     unsigned keep)
+@@ -595,7 +606,7 @@ vmod_filter_add_regex(VRT_CTX, struct VP
+ 	}
+ 
+ 	qsf->match = qs_match_regex;
+-	qsf->free = VRT_re_fini;
++	qsf->free = qs_free_regex;
+ 	VTAILQ_INSERT_TAIL(&obj->filters, qsf, list);
+ }
+