diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index c313135f8f36..311fbc4f8387 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	5.3.1
+PORTVERSION=	5.4.0
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -19,8 +19,8 @@ NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
 ALL_TARGET=	release
-# 5.3.1
-REVISION=	3079
+# 5.4.0
+REVISION=	3135
 # 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 683a2f9281eb..af8a4ef60339 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569672475
-SHA256 (davmail-src-5.3.1-3079.tgz) = 2e55ffb4edc0995ee4d8f577344afaa4ae533a708727ddad93966ab75ad73586
-SIZE (davmail-src-5.3.1-3079.tgz) = 19287086
+TIMESTAMP = 1582399896
+SHA256 (davmail-src-5.4.0-3135.tgz) = 94ece91a785dddcd9870adb29cb067871fdc50aa16bb8ff6f46f1a707f67b40b
+SIZE (davmail-src-5.4.0-3135.tgz) = 21073238
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index ac4c9109e919..f4c0b3b7ffbf 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -23,6 +23,8 @@ 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
 %%DATADIR%%/DavMail.app/Contents/Java/woodstox-core-5.1.0.jar
@@ -77,6 +79,7 @@ share/applications/davmail.desktop
 %%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
+%%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-5.1.0.jar