diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
index d84e76326950..bf0605585e9d 100644
--- a/www/varnish4/Makefile
+++ b/www/varnish4/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	varnish
 PORTVERSION=	4.1.11
 DISTVERSIONPREFIX=	varnish-
 PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 CONFLICTS=	varnish6 varnish7
 
 USES=		autoreconf:2.69 cpe gmake libedit libtool ncurses pathfix \
 		pkgconfig python:build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/vmodtool.py
 CPE_VENDOR=	varnish-cache
+CPE_PRODUCT=	varnish_cache
 CFLAGS+=	-I${LOCALBASE}/include -Wno-error
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check  # some tests fail
 TEST_ARGS=	TESTS_PARALLELISM=1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	varnishcache
 GH_PROJECT=	varnish-cache
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/varnish6/Makefile b/www/varnish6/Makefile
index c4000df444a2..ac1abd0d9531 100644
--- a/www/varnish6/Makefile
+++ b/www/varnish6/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	varnish
 PORTVERSION=	6.6.2
 DISTVERSIONPREFIX=	varnish-
 PORTREVISION=	0
 CATEGORIES=	www
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		autoreconf compiler cpe gmake libedit libtool ncurses pathfix \
 		pkgconfig python:3.4+,build readline shebangfix
 
 CONFLICTS=	varnish4 varnish7
 
 SHEBANG_FILES=	lib/libvcc/*.py
 CPE_VENDOR=	varnish-cache
+CPE_PRODUCT=	varnish_cache
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --without-dot
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 TEST_ARGS=	TESTS_PARALLELISM=1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	varnishcache
 GH_PROJECT=	varnish-cache
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	${REINPLACE_CMD} -e '/-Wno-unknown-warning-option -Wno-implicit-fallthrough/d' ${WRKSRC}/configure.ac
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/varnish7/Makefile b/www/varnish7/Makefile
index 84b65dedfa90..e942a7284b5f 100644
--- a/www/varnish7/Makefile
+++ b/www/varnish7/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	varnish
 DISTVERSION=	7.1.0
 DISTVERSIONPREFIX=	varnish-
 CATEGORIES=	www
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USES=		autoreconf compiler cpe gmake libedit libtool ncurses pathfix \
 		pkgconfig python:3.6+,build readline shebangfix
 
 CONFLICTS=	varnish4 varnish6
 
 SHEBANG_FILES=	lib/libvcc/*.py lib/libvsc/*.py
 CPE_VENDOR=	varnish-cache
+CPE_PRODUCT=	varnish_cache
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --without-dot
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 TEST_ARGS=	TESTS_PARALLELISM=1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	varnishcache
 GH_PROJECT=	varnish-cache
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 	${REINPLACE_CMD} -e '/-Wno-unknown-warning-option -Wno-implicit-fallthrough/d' ${WRKSRC}/configure.ac
 .endif
 
 .include <bsd.port.post.mk>