diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index ff43f3f1a98a..002e6470b66b 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,80 +1,79 @@
 PORTNAME=	dbmail
 PORTVERSION=	3.4.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	SQL database-based mail system (POP3 and IMAP)
 WWW=		http://www.dbmail.org/
 
 LICENSE=	GPLv2
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-
 BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		docbook-sgml>0:textproc/docbook-sgml \
 		xmlto:textproc/xmlto
 LIB_DEPENDS=	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}
 
 MAKE_ARGS+=	mandir=${MANPREFIX}/man
 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
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 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}
 	@${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/files/patch-src_mpool_mpool.c b/mail/dbmail/files/patch-src_mpool_mpool.c
new file mode 100644
index 000000000000..281c65aab0ab
--- /dev/null
+++ b/mail/dbmail/files/patch-src_mpool_mpool.c
@@ -0,0 +1,38 @@
+--- src/mpool/mpool.c.orig
++++ src/mpool/mpool.c
+@@ -241,6 +241,7 @@
+   (void)printf("allocating %u pages or %lu bytes\n", page_n, size);
+ #endif
+   
++#if 0
+   if (BIT_IS_SET(mp_p->mp_flags, MPOOL_FLAG_USE_SBRK)) {
+     mem = sbrk(size);
+     if (mem == (void *)-1) {
+@@ -263,7 +264,9 @@
+       mem = (char *)mem + fill;
+     }
+   }
+-  else {
++  else
++#endif
++  {
+     state = MAP_PRIVATE;
+ #ifdef MAP_FILE
+     state |= MAP_FILE;
+@@ -937,12 +940,15 @@
+     }
+   }
+   
++#if 0
+   if (BIT_IS_SET(flags, MPOOL_FLAG_USE_SBRK)) {
+     mp.mp_fd = -1;
+     mp.mp_addr = NULL;
+     mp.mp_top = 0;
+   }
+-  else {
++  else
++#endif
++  {
+     /* open dev-zero for our mmaping */
+     mp.mp_fd = open("/dev/zero", O_RDWR, 0);
+     if (mp.mp_fd < 0) {