diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 89e4c2a26574..89ee3d25a584 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,135 +1,135 @@
 PORTNAME=	courier-imap
-PORTVERSION=	5.2.11
+PORTVERSION=	5.3.0
 PORTEPOCH=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 WWW=		https://www.courier-mta.org/imap/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
 		libcourierauth.so:security/courier-authlib-base \
 		libidn2.so:dns/libidn2 \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
 		tar:bzip2
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
 CONFLICTS=	courier imap-uw panda-imap
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
 ALL_TARGET=	all makeimapaccess makedat
 
 SUB_FILES=	pkg-message
 SUB_LIST=	CONFDIR=${CONFDIR}
 
 #
 # options available:
 #
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
 OPTIONS_DEFINE=	GDBM GNUTLS INOTIFY IPV6 TRASHQUOTA
 
 GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
 INOTIFY_DESC=	Inotify support for IDLE command
 TRASHQUOTA_DESC=	Include deleted mails in the quota
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
 .endif
 
 CONFDIR?=	${PREFIX}/etc/${PORTNAME}
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--localstatedir="${PREFIX}/var" \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--enable-workarounds-for-imap-client-bugs \
 		--enable-unicode \
 		--disable-root-check \
 		--with-locking-method=fcntl \
 		--with-notice=unicode
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_USES=		pkgconfig
 
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 IPV6_CONFIGURE_OFF=	--without-ipv6
 
 TRASHQUOTA_CONFIGURE_ON=--with-trashquota
 
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG_FACILITY}
 CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
 .endif
 
 EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		libs/imap/ChangeLog \
 		libs/imap/README.proxy \
 		libs/maildir/README.imapkeywords.html \
 		libs/maildir/README.maildirfilter.html \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt \
 		libs/tcpd/README.couriertls \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/libs/liblock/configure
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
 		-e 's|@LN_S@|${RLN}|' \
 		${WRKSRC}/Makefile.in
 
 post-patch-INOTIFY-on:
 	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& -L${LOCALBASE}/lib -linotify -lpthread|' \
 		${WRKSRC}/libs/maildir/Makefile.in \
 		${WRKSRC}/libs/imap/Makefile.in
 
 post-configure-INOTIFY-on:
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index fb0b026e5857..a3aea119155f 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744019947
-SHA256 (courier-imap-5.2.11.tar.bz2) = 49fd73f7f056f4525aba4767cf912999d69f2f5efd757094159e4fc38c783122
-SIZE (courier-imap-5.2.11.tar.bz2) = 3418726
+TIMESTAMP = 1760736758
+SHA256 (courier-imap-5.3.0.tar.bz2) = e5a51e160124ff0baa048af7ea918926080e4f3b3b7d3651b50278718e12e189
+SIZE (courier-imap-5.3.0.tar.bz2) = 3731603
diff --git a/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h b/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h
new file mode 100644
index 000000000000..af387f7e7dd7
--- /dev/null
+++ b/mail/courier-imap/files/patch-libs_rfc2045_rfc2045.h
@@ -0,0 +1,11 @@
+--- libs/rfc2045/rfc2045.h.orig	2025-10-06 09:00:02 UTC
++++ libs/rfc2045/rfc2045.h
+@@ -3224,7 +3224,7 @@ void rfc822::mime_decoder<out_iter, src_type>::decode(
+ 
+ 	if (decode_header)
+ 	{
+-		typename rfc2045::entity::line_iter<crlf>::headers<
++		typename rfc2045::entity::line_iter<crlf>::template headers<
+ 			src_type> parser{e, src	};
+ 
+ 		parser.name_lc=header_name_lc;
diff --git a/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C
new file mode 100644
index 000000000000..649fadc8ea79
--- /dev/null
+++ b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp.C
@@ -0,0 +1,11 @@
+--- libs/rfc2045/testsuitecpp.C.orig	2025-10-04 09:00:06 UTC
++++ libs/rfc2045/testsuitecpp.C
+@@ -19,7 +19,7 @@ void testrfc2045line_iter_testset(int &testnum, test_t
+ 		auto b=s.begin();
+ 		auto e=s.end();
+ 
+-		typename rfc2045::entity::line_iter<crlf>::iter<
++		typename rfc2045::entity::line_iter<crlf>::template iter<
+ 			std::string_view::iterator,
+ 			std::string_view::iterator
+ 			>
diff --git a/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C
new file mode 100644
index 000000000000..353465b17a71
--- /dev/null
+++ b/mail/courier-imap/files/patch-libs_rfc2045_testsuitecpp2.C
@@ -0,0 +1,29 @@
+--- libs/rfc2045/testsuitecpp2.C.orig	2025-09-10 09:00:05 UTC
++++ libs/rfc2045/testsuitecpp2.C
+@@ -217,7 +217,7 @@ void test3()
+ 	auto b=std::istreambuf_iterator<char>{ss};
+ 	auto e=std::istreambuf_iterator<char>{};
+ 
+-	typename rfc2045::entity::line_iter<crlf>::iter<
++	typename rfc2045::entity::line_iter<crlf>::template iter<
+ 		std::istreambuf_iterator<char>,
+ 		std::istreambuf_iterator<char>
+ 		> iter{b, e};
+@@ -310,7 +310,7 @@ void test4()
+ 	auto b=std::istreambuf_iterator<char>{ss};
+ 	auto e=std::istreambuf_iterator<char>{};
+ 
+-	typename rfc2045::entity::line_iter<crlf>::iter<
++	typename rfc2045::entity::line_iter<crlf>::template iter<
+ 		std::istreambuf_iterator<char>,
+ 		std::istreambuf_iterator<char>
+ 		> iter{b, e};
+@@ -488,7 +488,7 @@ void test5()
+ 	auto b=std::istreambuf_iterator<char>{ss};
+ 	auto e=std::istreambuf_iterator<char>{};
+ 
+-	typename rfc2045::entity::line_iter<crlf>::iter<
++	typename rfc2045::entity::line_iter<crlf>::template iter<
+ 		std::istreambuf_iterator<char>,
+ 		std::istreambuf_iterator<char>
+ 		> iter{b, e};