diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 20aa942e02d0..795d0067b2ee 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	dbmail
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.5.4
+DISTVERSION=	3.5.5
 CATEGORIES=	mail
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	SQL database-based mail system (POP3 and IMAP)
 WWW=		http://www.dbmail.org/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		docbook-sgml>0:textproc/docbook-sgml \
 		xmlto:textproc/xmlto
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libgmime-3.0.so:mail/gmime30 \
 		libmhash.so:security/mhash \
 		libzdb.so:databases/libzdb
 
 USES=		autoreconf gmake gnome libtool localbase pkgconfig shebangfix \
 		ssl
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 SHEBANG_FILES=	man/fixsp.pl
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-manpages \
 			--sysconfdir=${LOCALBASE}/etc \
 			--with-zdb=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB+=	DBMAIL_GROUP="${DBMAIL_GROUP}" \
 		DBMAIL_USER="${DBMAIL_USER}" \
 		PIDDIR="${PIDDIR}"
 
 OPTIONS_DEFINE=		DOCS LDAP SIEVE
 OPTIONS_DEFAULT=	SIEVE
 OPTIONS_SUB=		yes
 
 SIEVE_DESC=		Sieve mail sorting language support
 
 DOCS=		AUTHORS CHANGELOG.md INSTALL README THANKS UPGRADING
 LDAP_USES=		gettext-runtime ldap
 LDAP_CONFIGURE_WITH=	ldap
 SIEVE_LIB_DEPENDS=	libsieve.so:mail/libsieve
 SIEVE_CONFIGURE_WITH=	sieve
 
 DBMAIL_USER?=	mailnull
 DBMAIL_GROUP?=	mail
 PIDDIR?=	/var/run/dbmail
 
 post-patch:
 	@${REINPLACE_CMD} -e '/dbmail-sieved\.8 /d' \
 		${WRKSRC}/man/Makefile.am \
 		${WRKSRC}/man/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf.sample
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/dbmail.schema ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/sql && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PIDDIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 0e838f1a0fa8..d4d6d2c971e0 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751534573
-SHA256 (dbmail-dbmail-v3.5.4_GH0.tar.gz) = 509a189c083c44bedadb320c037b144d9f2d1955b9a54dbb9dd3d73c7e8337c9
-SIZE (dbmail-dbmail-v3.5.4_GH0.tar.gz) = 2547614
+TIMESTAMP = 1759523898
+SHA256 (dbmail-dbmail-v3.5.5_GH0.tar.gz) = 1c86be8d4eeed3dd676c91a907b75fe70da8182791c3b6ae04c5b56396ec3ae0
+SIZE (dbmail-dbmail-v3.5.5_GH0.tar.gz) = 2553083
diff --git a/mail/dbmail/files/patch-src_clientbase.c b/mail/dbmail/files/patch-src_clientbase.c
index 19e6aa57533b..aa7fb8b4f9f4 100644
--- a/mail/dbmail/files/patch-src_clientbase.c
+++ b/mail/dbmail/files/patch-src_clientbase.c
@@ -1,29 +1,26 @@
---- src/clientbase.c.orig	2022-10-15 15:02:38 UTC
+--- src/clientbase.c.orig	2025-10-04 10:47:08 UTC
 +++ src/clientbase.c
-@@ -152,7 +152,7 @@ ClientBase_T * client_init(client_sock *c)
+@@ -152,20 +152,20 @@ ClientBase_T * client_init(client_sock *c)
  		client->tx		= STDOUT_FILENO;
  	} else {
  		/* server-side */
--		if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip, 
-+		if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip, 
- 						NI_MAXHOST, client->dst_port, 
- 						NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) {
+-		if ((serr = getnameinfo(&c->saddr, c->saddr_len, client->dst_ip,
++		if ((serr = getnameinfo(&c->saddr, c->saddr.sa_len, client->dst_ip,
+ 			NI_MAXHOST, client->dst_port,
+ 			NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV))) {
  			TRACE(TRACE_INFO, "getnameinfo::error [%s]", gai_strerror(serr));
-@@ -160,7 +160,7 @@ ClientBase_T * client_init(client_sock *c)
+ 		}
  
  		/* client-side */
+-		if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip,
++		if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip,
+ 			NI_MAXHOST-1, client->src_port,
+ 			NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) {
+ 			TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
+ 		}
  		if (server_conf->resolveIP) {
 -			if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->clientname,
 +			if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->clientname,
- 						       	NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) {
- 				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
- 			} 
-@@ -171,7 +171,7 @@ ClientBase_T * client_init(client_sock *c)
- 					client->clientname[0] ? client->clientname : "Lookup failed");
- 		} else {
- 
--			if ((serr = getnameinfo(&c->caddr, c->caddr_len, client->src_ip,
-+			if ((serr = getnameinfo(&c->caddr, c->caddr.sa_len, client->src_ip,
- 						       	NI_MAXHOST-1, client->src_port,
- 						       	NI_MAXSERV-1, NI_NUMERICHOST | NI_NUMERICSERV))) {
+ 				NI_MAXHOST-1, NULL, 0, NI_NAMEREQD))) {
  				TRACE(TRACE_INFO, "getnameinfo:error [%s]", gai_strerror(serr));
+ 			}