diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index 311fbc4f8387..f2555e75f480 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	5.4.0
+PORTVERSION=	5.5.1
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -20,7 +20,7 @@ USE_ANT=	yes
 USE_JAVA=	yes
 ALL_TARGET=	release
 # 5.4.0
-REVISION=	3135
+REVISION=	3299
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index af8a4ef60339..e40329a20adc 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582399896
-SHA256 (davmail-src-5.4.0-3135.tgz) = 94ece91a785dddcd9870adb29cb067871fdc50aa16bb8ff6f46f1a707f67b40b
-SIZE (davmail-src-5.4.0-3135.tgz) = 21073238
+TIMESTAMP = 1600772850
+SHA256 (davmail-src-5.5.1-3299.tgz) = 63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508
+SIZE (davmail-src-5.5.1-3299.tgz) = 20780537
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index f4c0b3b7ffbf..274e6513e486 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -13,6 +13,7 @@ share/applications/davmail.desktop
 %%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/jcharset-2.0.jar
 %%DATADIR%%/DavMail.app/Contents/Java/jcifs-1.3.14.jar
@@ -23,7 +24,6 @@ share/applications/davmail.desktop
 %%DATADIR%%/DavMail.app/Contents/Java/log4j-1.2.16.jar
 %%DATADIR%%/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar
 %%DATADIR%%/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar
-%%DATADIR%%/lib/sonarqube-ant-task-2.7.0.1612.jar
 %%DATADIR%%/DavMail.app/Contents/Java/sonarqube-ant-task-2.7.0.1612.jar
 %%DATADIR%%/DavMail.app/Contents/Java/stax-api-1.0.1.jar
 %%DATADIR%%/DavMail.app/Contents/Java/stax2-api-3.1.1.jar
@@ -39,21 +39,24 @@ share/applications/davmail.desktop
 %%DATADIR%%/lib/commons-collections-3.1.jar
 %%DATADIR%%/lib/commons-httpclient-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/jcharset-2.0.jar
 %%DATADIR%%/lib/jcifs-1.3.14.jar
 %%DATADIR%%/lib/jdom-1.0.jar
 %%DATADIR%%/lib/jettison-1.4.0.jar
-%%DATADIR%%/lib/junit-3.8.1.jar
+%%DATADIR%%/lib/junit-4.12.jar
 %%DATADIR%%/lib/libgrowl-0.2.jar
 %%DATADIR%%/lib/libgrowl.jnilib
 %%DATADIR%%/lib/log4j-1.2.16.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/stax-api-1.0.1.jar
 %%DATADIR%%/lib/stax2-api-3.1.1.jar
 %%DATADIR%%/lib/winrun4j-0.4.5.jar
@@ -66,16 +69,18 @@ share/applications/davmail.desktop
 %%DATADIR%%/web/WEB-INF/lib/commons-httpclient-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.4.0.jar
-%%DATADIR%%/web/WEB-INF/lib/junit-3.8.1.jar
+%%DATADIR%%/web/WEB-INF/lib/junit-4.12.jar
 %%DATADIR%%/web/WEB-INF/lib/log4j-1.2.16.jar
 %%DATADIR%%/web/WEB-INF/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar