diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 892069301862..539c6dcb1e1c 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	davmail
-PORTVERSION=	6.1.0
-PORTREVISION=	2
+DISTVERSION=	6.5.1
 CATEGORIES=	mail java
-MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
+DISTNAME=	${PORTNAME}-src-${DISTVERSION}-${REVISION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
 WWW=		https://davmail.sourceforge.net/
 
 LICENSE=	GPLv2
 
 USES=		dos2unix java:ant,run tar:tgz
 
 DOS2UNIX_FILES=	build.xml
-USE_RC_SUBR=	davmail
-# 6.1.0
-REVISION=	3423
+USE_RC_SUBR=	${PORTNAME}
+# 6.5.1
+REVISION=	3873
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
 ALL_TARGET=	release
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
-SUB_FILES=	davmail.sh pkg-message
+SUB_FILES=	${PORTNAME}.sh pkg-message
 
-USERS=		davmail
-GROUPS=		davmail
+WRKSRC=		${WRKDIR}/${PORTNAME}-src-${DISTVERSION}
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
 
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
+PLIST_SUB=	VERSION="${DISTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#prefix=\"usr#prefix=\"${PREFIX}#' \
 		${WRKSRC}/build.xml
 
 # Azul JRE FX has been disabled by removing the target:
 # <antcall target="download-jre"/>
 # in files/patch-build.xml patch.
 do-install:
 	@cd ${WRKSRC}/dist && ${FIND} . -type d \
 		-exec ${MKDIR} ${STAGEDIR}${DATADIR}/\{} \;
 	@cd ${WRKSRC}/dist && ${FIND} . -type f \
 		-not -name "*.deb" \
 		-not -name "*.md5" \
 		-not -name "*.MD5" \
 		-not -name "*.tgz" \
 		-not -name "*.exe" \
 		-not -name "swt-*.jar" \
 		-not -name "*.zip" \
 		-not -name "*.war" \
 		-not -name "*.rpm" \
 		-not -name "*.desktop" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}${DATADIR}/\{} \;
 	@${FIND} ${STAGEDIR}/${DATADIR} -depth -empty -type d -delete
-	${INSTALL_SCRIPT} ${WRKDIR}/davmail.sh \
-		${STAGEDIR}${PREFIX}/bin/davmail
-	${INSTALL_DATA} ${WRKSRC}/src/etc/davmail.properties \
-		${STAGEDIR}${PREFIX}/etc/davmail.properties.sample
-	${INSTALL_DATA} ${WRKSRC}/src/desktop/davmail.desktop \
-		${STAGEDIR}${PREFIX}/share/applications/
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}.properties \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.properties.sample
+	${INSTALL_DATA} ${WRKSRC}/src/desktop/${PORTNAME}.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index 9177f4b8b78c..b2d9bc8d0cf7 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687354803
-SHA256 (davmail-src-6.1.0-3423.tgz) = 08e7103d14e9f05ec269caceef7585dcf8be202a35c471fa6fc12729cf99ef2f
-SIZE (davmail-src-6.1.0-3423.tgz) = 21347199
+TIMESTAMP = 1740960000
+SHA256 (davmail-src-6.5.1-3873.tgz) = b406c7e994b718c221bf7ee8abb5afb02846cd7e42203662a7eb59509cb90781
+SIZE (davmail-src-6.5.1-3873.tgz) = 24162841
diff --git a/mail/davmail/files/patch-build.xml b/mail/davmail/files/patch-build.xml
index 4684f60df625..de6dff6e1abd 100644
--- a/mail/davmail/files/patch-build.xml
+++ b/mail/davmail/files/patch-build.xml
@@ -1,19 +1,20 @@
---- build.xml.orig	2021-11-06 18:00:46 UTC
+--- build.xml.orig	2025-02-14 09:55:18 UTC
 +++ build.xml
-@@ -88,7 +88,7 @@
+@@ -97,7 +97,7 @@
      </target>
  
      <target name="defaultrelease" unless="is.svn">
 -        <property name="release" value="${version}"/>
-+	<property name="release" value="${version}-${revision}"/>
++        <property name="release" value="${version}-${revision}"/>
      </target>
  
-     <target name="init" depends="check-encoding, check-java8, svnrelease, gitsvnrelease, defaultrelease">
-@@ -412,7 +412,6 @@
-                 <exclude name="lib/hamcrest-core-*.jar"/>
-             </fileset>
+     <target name="init" depends="check-encoding, svnrelease, gitsvnrelease, defaultrelease">
+@@ -411,8 +411,6 @@
+                 <include name="davmail"/>
+             </zipfileset>
          </zip>
 -        <antcall target="download-jre"/>
+-        <antcall target="download-build-jre"/>
          <zip file="dist/davmail-${release-name}-windows-standalone.zip">
              <fileset dir="dist">
                  <include name="jre/**"/>
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index 4bce9325c4c5..8535dfa45528 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -1,83 +1,55 @@
 bin/davmail
 @sample etc/davmail.properties.sample
 share/applications/davmail.desktop
-%%DATADIR%%/%%PORTVERSION%%/RELEASE-NOTES.md
+%%DATADIR%%/%%VERSION%%/RELEASE-NOTES.md
 %%DATADIR%%/DavMail.app/Contents/Info.plist
 %%DATADIR%%/DavMail.app/Contents/Java/activation-1.1.1.jar
-%%DATADIR%%/DavMail.app/Contents/Java/commons-codec-1.11.jar
+%%DATADIR%%/DavMail.app/Contents/Java/commons-codec-1.15.jar
 %%DATADIR%%/DavMail.app/Contents/Java/commons-collections-3.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/commons-logging-1.0.4.jar
 %%DATADIR%%/DavMail.app/Contents/Java/davmail.jar
-%%DATADIR%%/DavMail.app/Contents/Java/htmlcleaner-2.21.jar
-%%DATADIR%%/DavMail.app/Contents/Java/httpclient-4.5.6.jar
-%%DATADIR%%/DavMail.app/Contents/Java/httpcore-4.4.10.jar
-%%DATADIR%%/DavMail.app/Contents/Java/jackrabbit-webdav-2.14.6.jar
-%%DATADIR%%/DavMail.app/Contents/Java/jacocoant-0.8.5.jar
-%%DATADIR%%/DavMail.app/Contents/Java/javax.mail-1.5.6.jar
+%%DATADIR%%/DavMail.app/Contents/Java/htmlcleaner-2.29.jar
+%%DATADIR%%/DavMail.app/Contents/Java/httpclient-4.5.14.jar
+%%DATADIR%%/DavMail.app/Contents/Java/httpcore-4.4.16.jar
+%%DATADIR%%/DavMail.app/Contents/Java/jackrabbit-webdav-2.20.15.jar
+%%DATADIR%%/DavMail.app/Contents/Java/javax.mail-1.6.2.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jcharset-2.0.jar
-%%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.14.jar
+%%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.19.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jdom-1.0.jar
-%%DATADIR%%/DavMail.app/Contents/Java/jettison-1.5.3.jar
-%%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.17.jar
-%%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar
-%%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar
-%%DATADIR%%/DavMail.app/Contents/Java/sonarqube-ant-task-2.7.0.1612.jar
+%%DATADIR%%/DavMail.app/Contents/Java/jettison-1.5.4.jar
+%%DATADIR%%/DavMail.app/Contents/Java/reload4j-1.2.26.jar
+%%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-2.0.16.jar
+%%DATADIR%%/DavMail.app/Contents/Java/slf4j-reload4j-2.0.16.jar
 %%DATADIR%%/DavMail.app/Contents/Java/stax-api-1.0.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/stax2-api-3.1.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-6.4.0.jar
 %%DATADIR%%/DavMail.app/Contents/MacOS/davmail
 %%DATADIR%%/DavMail.app/Contents/Resources/tray.icns
 %%DATADIR%%/davmail
 %%DATADIR%%/davmail.jar
 %%DATADIR%%/davmail.png
+%%DATADIR%%/davmail64.ini
+%%DATADIR%%/davmailservice64.ini
 %%DATADIR%%/lib/activation-1.1.1.jar
-%%DATADIR%%/lib/commons-codec-1.11.jar
+%%DATADIR%%/lib/commons-codec-1.15.jar
 %%DATADIR%%/lib/commons-collections-3.1.jar
 %%DATADIR%%/lib/commons-logging-1.0.4.jar
 %%DATADIR%%/lib/hamcrest-core-1.3.jar
-%%DATADIR%%/lib/htmlcleaner-2.21.jar
-%%DATADIR%%/lib/httpclient-4.5.6.jar
-%%DATADIR%%/lib/httpcore-4.4.10.jar
-%%DATADIR%%/lib/jackrabbit-webdav-2.14.6.jar
-%%DATADIR%%/lib/jacocoant-0.8.5.jar
-%%DATADIR%%/lib/javax.mail-1.5.6.jar
+%%DATADIR%%/lib/htmlcleaner-2.29.jar
+%%DATADIR%%/lib/httpclient-4.5.14.jar
+%%DATADIR%%/lib/httpcore-4.4.16.jar
+%%DATADIR%%/lib/jackrabbit-webdav-2.20.15.jar
+%%DATADIR%%/lib/javax.mail-1.6.2.jar
 %%DATADIR%%/lib/jcharset-2.0.jar
-%%DATADIR%%/lib/jcifs-1.3.14.jar
+%%DATADIR%%/lib/jcifs-1.3.19.jar
 %%DATADIR%%/lib/jdom-1.0.jar
-%%DATADIR%%/lib/jettison-1.5.3.jar
+%%DATADIR%%/lib/jettison-1.5.4.jar
 %%DATADIR%%/lib/junit-4.13.1.jar
-%%DATADIR%%/lib/log4j-1.2.17.jar
-%%DATADIR%%/lib/slf4j-api-1.7.25.jar
-%%DATADIR%%/lib/slf4j-log4j12-1.7.25.jar
-%%DATADIR%%/lib/sonarqube-ant-task-2.7.0.1612.jar
+%%DATADIR%%/lib/reload4j-1.2.26.jar
+%%DATADIR%%/lib/slf4j-api-2.0.16.jar
+%%DATADIR%%/lib/slf4j-reload4j-2.0.16.jar
 %%DATADIR%%/lib/stax-api-1.0.1.jar
 %%DATADIR%%/lib/stax2-api-3.1.1.jar
 %%DATADIR%%/lib/winrun4j-0.4.5.jar
 %%DATADIR%%/lib/woodstox-core-6.4.0.jar
 %%DATADIR%%/version.txt
-%%DATADIR%%/web/WEB-INF/classes/davmail.properties
-%%DATADIR%%/web/WEB-INF/lib/activation-1.1.1.jar
-%%DATADIR%%/web/WEB-INF/lib/commons-codec-1.11.jar
-%%DATADIR%%/web/WEB-INF/lib/commons-collections-3.1.jar
-%%DATADIR%%/web/WEB-INF/lib/commons-logging-1.0.4.jar
-%%DATADIR%%/web/WEB-INF/lib/davmail.jar
-%%DATADIR%%/web/WEB-INF/lib/hamcrest-core-1.3.jar
-%%DATADIR%%/web/WEB-INF/lib/htmlcleaner-2.21.jar
-%%DATADIR%%/web/WEB-INF/lib/httpclient-4.5.6.jar
-%%DATADIR%%/web/WEB-INF/lib/httpcore-4.4.10.jar
-%%DATADIR%%/web/WEB-INF/lib/jackrabbit-webdav-2.14.6.jar
-%%DATADIR%%/web/WEB-INF/lib/jacocoant-0.8.5.jar
-%%DATADIR%%/web/WEB-INF/lib/javax.mail-1.5.6.jar
-%%DATADIR%%/web/WEB-INF/lib/jcharset-2.0.jar
-%%DATADIR%%/web/WEB-INF/lib/jcifs-1.3.14.jar
-%%DATADIR%%/web/WEB-INF/lib/jdom-1.0.jar
-%%DATADIR%%/web/WEB-INF/lib/jettison-1.5.3.jar
-%%DATADIR%%/web/WEB-INF/lib/junit-4.13.1.jar
-%%DATADIR%%/web/WEB-INF/lib/log4j-1.2.17.jar
-%%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar
-%%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar
-%%DATADIR%%/web/WEB-INF/lib/sonarqube-ant-task-2.7.0.1612.jar
-%%DATADIR%%/web/WEB-INF/lib/stax-api-1.0.1.jar
-%%DATADIR%%/web/WEB-INF/lib/stax2-api-3.1.1.jar
-%%DATADIR%%/web/WEB-INF/lib/woodstox-core-6.4.0.jar
-%%DATADIR%%/web/WEB-INF/web.xml