diff --git a/mail/vexim/Makefile b/mail/vexim/Makefile
index fcb48c24480c..a543418b32f2 100644
--- a/mail/vexim/Makefile
+++ b/mail/vexim/Makefile
@@ -1,66 +1,67 @@
 # Created by: John Oxley <john@yoafrica.com>
 
 PORTNAME=	vexim
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	mail www
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Web interface for managing virtual domains for exim
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		gettext php
+USES=		gettext php:flavors
 USE_PHP=	gettext session posix
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}2
-GH_TAGNAME=	2f51492
+GH_TAGNAME=	cdfb0df
 
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL
 OPTIONS_DEFINE=		DOCS ORDER
 OPTIONS_DEFAULT=	MYSQL
 
 ORDER_DESC=		Sort userlist by localpart instead of realname
 ORDER_EXTRA_PATCHES=	${FILESDIR}/extrapatch-order
 
 MYSQL_USE=	php=pdo_mysql
 PGSQL_USE=	php=pdo_pgsql
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MORDER}
 post-patch:
 	${RM} -rv ${WRKSRC}/vexim/*.orig
 .endif
 
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}:"
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC}/vexim && ${FIND} . \
 		-type d -exec ${MKDIR} ${STAGEDIR}${WWWDIR}/{} \;  \
 		-o -type f \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${WWWDIR}/{} \;
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/setup && ${FIND} . \
 		-type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; \
 		-o -type f \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${FIND} docs \
 		-type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 		-o -type f \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 .for i in README.md TODO
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/vexim/distinfo b/mail/vexim/distinfo
index ab854700cefb..f006fce19bf1 100644
--- a/mail/vexim/distinfo
+++ b/mail/vexim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516528808
-SHA256 (vexim-vexim2-v2.3-2f51492_GH0.tar.gz) = 2dc3fcbf795026cf4b7befbbb64e510b28faf70ca41cab77ac72d127c032ac88
-SIZE (vexim-vexim2-v2.3-2f51492_GH0.tar.gz) = 138938
+TIMESTAMP = 1645219726
+SHA256 (vexim-vexim2-v2.3-cdfb0df_GH0.tar.gz) = ee39742a5b43915354601542967d2be216dd4dfb37007860824b485a53724712
+SIZE (vexim-vexim2-v2.3-cdfb0df_GH0.tar.gz) = 139541