diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 02523fdbb7237..6979edcbf9a26 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -1,7 +1,7 @@
 # Created by: John Prather
 
 PORTNAME=	davmail
-PORTVERSION=	6.0.0
+PORTVERSION=	6.0.1
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -14,23 +14,24 @@ LICENSE=	GPLv2
 USES=		dos2unix tar:tgz
 
 DOS2UNIX_FILES=	build.xml
-NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
-ALL_TARGET=	release
-# 6.0.0
-REVISION=	3375
+USE_RC_SUBR=	davmail
+# 6.0.1
+REVISION=	3390
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
+ALL_TARGET=	release
+
+NO_ARCH=	yes
+SUB_FILES=	davmail.sh pkg-message
 
 USERS=		davmail
 GROUPS=		davmail
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-USE_RC_SUBR=	davmail
-SUB_FILES=	davmail.sh pkg-message
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
@@ -56,9 +57,11 @@ do-install:
 		-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_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_DATA} ${WRKSRC}/src/desktop/davmail.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index c5c95413eb302..a0443dfa8baf0 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636219585
-SHA256 (davmail-src-6.0.0-3375.tgz) = 2d719188671f7a621c82ce7bc6d1d781ed18c8d52a9af23e7bc5288df2b649a5
-SIZE (davmail-src-6.0.0-3375.tgz) = 21329359
+TIMESTAMP = 1639155768
+SHA256 (davmail-src-6.0.1-3390.tgz) = ce3b33cd187787a30ccc136e75f1cdf197b0a2874c20ab3f3ea3e426b32b9ab1
+SIZE (davmail-src-6.0.1-3390.tgz) = 21330154