diff --git a/mail/panda-imap/Makefile b/mail/panda-imap/Makefile
index f7f2f1a18a27..497b7d4c6536 100644
--- a/mail/panda-imap/Makefile
+++ b/mail/panda-imap/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	panda-imap
 PORTVERSION=	20130621
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IMAP4rev1/POP2/POP3 mail servers forked from imap-uw
 WWW=		https://github.com/jonabbey/panda-imap
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libc-client.so.2010:mail/panda-cclient
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonabbey
-GH_TAGNAME=	3452f1598a8b4eeb44b38aead1c1598e379b05de
+GH_TAGNAME=	01eaaa96c85c5791d5cffdf20c360b329bc44d88
 
 CONFLICTS_INSTALL=	imap-uw # bin/dmail
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	pkg-message
 
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	bsf
 
 # This port must have the same SSL settings as mail/cclient, which it depends on
 # To make MBX format the default mailbox format, change the settings of cclient
 
 OPTIONS_DEFINE=	DOCS SSL SSL_AND_PLAINTEXT
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=	yes
 
 SSL_AND_PLAINTEXT_DESC=	Allow plain text passwords and SSL
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MSSL}
 MAKE_ARGS+=	SSLTYPE=none SSLDIR=${OPENSSLBASE}
 .else
 USES+=		ssl
 .if ${PORT_OPTIONS:MSSL_AND_PLAINTEXT}
 MAKE_ARGS+=	SSLTYPE=unix
 .else
 MAKE_ARGS+=	SSLTYPE=unix.nopwd
 .endif
 .endif
 
 # See src/imapd/Makefile for more information about these two options.
 
 .include <bsd.port.pre.mk>
 post-patch:
 	@${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \
 		${WRKSRC}/docs/imaprc.txt
 	@${RM} ${WRKSRC}/docs/imaprc.txt.bak
 
 pre-build:
 	@${SH} ${FILESDIR}/pkg-req.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 .if ${PORT_OPTIONS:MSSL}
 	@${SH} ${FILESDIR}/pkg-req.ssl ${LOCALBASE}/include/c-client/portrevision.h yes
 .else
 	@${SH} ${FILESDIR}/pkg-req.ssl ${LOCALBASE}/include/c-client/portrevision.h no
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL} ${COPY} ${STRIP}	\
 		${WRKSRC}/mlock/mlock ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${STAGEDIR}${PREFIX}/bin/mboxtest
 	${INSTALL_MAN} \
 		${WRKSRC}/src/imapd/imapd.8 ${STAGEDIR}${PREFIX}/man/man8/imapd.8
 	${INSTALL_MAN} \
 		${WRKSRC}/src/ipopd/ipopd.8 ${STAGEDIR}${PREFIX}/man/man8/ipopd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 post-install-DOCS-on:
 	${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | \
 		(umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -)
 
 cert:
 	${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs
 	openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem
 	openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem
 	${CHMOD} 700 ${PREFIX}/certs/imapd.pem
 	${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem
 
 .include <bsd.port.post.mk>
diff --git a/mail/panda-imap/distinfo b/mail/panda-imap/distinfo
index a626c83eaa33..e1d92315fc5a 100644
--- a/mail/panda-imap/distinfo
+++ b/mail/panda-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650387979
-SHA256 (jonabbey-panda-imap-20130621-3452f1598a8b4eeb44b38aead1c1598e379b05de_GH0.tar.gz) = e65063633743065848ce0b594acda52b5d149ae426104a7fc1742de9e042c233
-SIZE (jonabbey-panda-imap-20130621-3452f1598a8b4eeb44b38aead1c1598e379b05de_GH0.tar.gz) = 2066879
+TIMESTAMP = 1667322364
+SHA256 (jonabbey-panda-imap-20130621-01eaaa96c85c5791d5cffdf20c360b329bc44d88_GH0.tar.gz) = 7e0dccfed4f722571fb2683f67a31c8104629873253e9c9a107c7ed2925742bf
+SIZE (jonabbey-panda-imap-20130621-01eaaa96c85c5791d5cffdf20c360b329bc44d88_GH0.tar.gz) = 2066955