diff --git a/mail/davmail/Makefile b/mail/davmail/Makefile
index d13d3a125fac..7d4da58e346c 100644
--- a/mail/davmail/Makefile
+++ b/mail/davmail/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	davmail
-PORTVERSION=	4.8.0
-PORTREVISION=	1
+PORTVERSION=	4.8.6
 CATEGORIES=	mail java
 MASTER_SITES=	SF/davmail/davmail/${PORTVERSION}
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-${REVISION}
@@ -14,13 +13,14 @@ COMMENT=	POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
 LICENSE=	GPLv2
 
 USES=		dos2unix tar:tgz
+
 DOS2UNIX_FILES=	build.xml
 NO_ARCH=	yes
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 ALL_TARGET=	release
-REVISION=	2479  # 4.8.0
+REVISION=	2600  # 4.8.6
 # port build number, same as on DISTNAME
 MAKE_ARGS=	-Drevision=${REVISION}
 MAKE_ENV+=	"ANT_OPTS=-Dfile.encoding=UTF-8"
@@ -32,6 +32,7 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 USE_RC_SUBR=	davmail
 SUB_FILES=	davmail.sh pkg-message
+PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#exec=\"davmail\"#exec=\"${PREFIX}/bin/davmail\"#' \
diff --git a/mail/davmail/distinfo b/mail/davmail/distinfo
index 35932995ae9b..dfed795d85bb 100644
--- a/mail/davmail/distinfo
+++ b/mail/davmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490529161
-SHA256 (davmail-src-4.8.0-2479.tgz) = c04ddd8cd858e89825d05591667250bf1fd7b33f8c21f86c16f72822d76143e6
-SIZE (davmail-src-4.8.0-2479.tgz) = 22740061
+TIMESTAMP = 1532270260
+SHA256 (davmail-src-4.8.6-2600.tgz) = cd5730ec03b9c02151e0ee5e3fc6fefa386ddf919d3b469328ea4f5b0fd42d98
+SIZE (davmail-src-4.8.6-2600.tgz) = 18216201
diff --git a/mail/davmail/pkg-plist b/mail/davmail/pkg-plist
index 6288d8f2f2c1..452cc0127658 100644
--- a/mail/davmail/pkg-plist
+++ b/mail/davmail/pkg-plist
@@ -1,6 +1,7 @@
 bin/davmail
 @sample etc/davmail.properties.sample
 share/applications/davmail.desktop
+%%DATADIR%%/%%PORTVERSION%%/releasenotes.txt
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Info.plist
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/activation-1.1.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-codec-1.3.jar
@@ -8,7 +9,7 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-httpclient-3.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/commons-logging-1.0.4.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/davmail.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/htmlcleaner-2.2.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/htmlcleaner-2.21.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jackrabbit-webdav-2.4.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcharset-1.3.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/jcifs-1.3.14.jar
@@ -17,8 +18,8 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/libgrowl.jnilib
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/log4j-1.2.16.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/mail-1.4.3.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.3.1.jar
-%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-log4j12-1.3.1.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-api-1.7.25.jar
+%%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/slf4j-log4j12-1.7.25.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/stax-api-1.0.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/stax2-api-3.1.1.jar
 %%JAVASHAREDIR%%/davmail/DavMail.app/Contents/Java/woodstox-core-asl-4.1.2.jar
@@ -34,7 +35,7 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/lib/commons-collections-3.1.jar
 %%JAVASHAREDIR%%/davmail/lib/commons-httpclient-3.1.jar
 %%JAVASHAREDIR%%/davmail/lib/commons-logging-1.0.4.jar
-%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.2.jar
+%%JAVASHAREDIR%%/davmail/lib/htmlcleaner-2.21.jar
 %%JAVASHAREDIR%%/davmail/lib/jackrabbit-webdav-2.4.3.jar
 %%JAVASHAREDIR%%/davmail/lib/jcharset-1.3.jar
 %%JAVASHAREDIR%%/davmail/lib/jcifs-1.3.14.jar
@@ -44,8 +45,8 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/lib/libgrowl.jnilib
 %%JAVASHAREDIR%%/davmail/lib/log4j-1.2.16.jar
 %%JAVASHAREDIR%%/davmail/lib/mail-1.4.3.jar
-%%JAVASHAREDIR%%/davmail/lib/slf4j-api-1.3.1.jar
-%%JAVASHAREDIR%%/davmail/lib/slf4j-log4j12-1.3.1.jar
+%%JAVASHAREDIR%%/davmail/lib/slf4j-api-1.7.25.jar
+%%JAVASHAREDIR%%/davmail/lib/slf4j-log4j12-1.7.25.jar
 %%JAVASHAREDIR%%/davmail/lib/stax-api-1.0.1.jar
 %%JAVASHAREDIR%%/davmail/lib/stax2-api-3.1.1.jar
 %%JAVASHAREDIR%%/davmail/lib/winrun4j-0.4.5.jar
@@ -59,7 +60,7 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-httpclient-3.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/commons-logging-1.0.4.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/davmail.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.2.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/htmlcleaner-2.21.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jackrabbit-webdav-2.4.3.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcharset-1.3.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/jcifs-1.3.14.jar
@@ -67,8 +68,8 @@ share/applications/davmail.desktop
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/junit-3.8.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/log4j-1.2.16.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/mail-1.4.3.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-api-1.3.1.jar
-%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-log4j12-1.3.1.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-api-1.7.25.jar
+%%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/slf4j-log4j12-1.7.25.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax-api-1.0.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/stax2-api-3.1.1.jar
 %%JAVASHAREDIR%%/davmail/web/WEB-INF/lib/woodstox-core-asl-4.1.2.jar