diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index f2ccd0ba551c..fec5438fd255 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.5.7.2
+PORTVERSION=	0.5.8
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -12,8 +12,8 @@ COMMENT=	Sieve plugin for the Dovecot 'deliver' LDA and LMTP
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	dovecot>=2.3.7:mail/dovecot
-RUN_DEPENDS=	dovecot>=2.3.7:mail/dovecot
+BUILD_DEPENDS=	dovecot>=2.3.8:mail/dovecot
+RUN_DEPENDS=	dovecot>=2.3.8:mail/dovecot
 
 DOVECOTVERSION=	2.3
 
diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
index dcefdc9d94a3..b7474f8dc560 100644
--- a/mail/dovecot-pigeonhole/distinfo
+++ b/mail/dovecot-pigeonhole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567007127
-SHA256 (dovecot-2.3-pigeonhole-0.5.7.2.tar.gz) = d59d0c5c5225a126e5b98bf95d75e8dd368bdeeb3da2e9766dbe4fddaa9411b0
-SIZE (dovecot-2.3-pigeonhole-0.5.7.2.tar.gz) = 1857602
+TIMESTAMP = 1570571306
+SHA256 (dovecot-2.3-pigeonhole-0.5.8.tar.gz) = 8fb860d50c1b1a09aea9e25f8ee89c22e34ecedfb0e11a1c48a7f67310759022
+SIZE (dovecot-2.3-pigeonhole-0.5.8.tar.gz) = 1857780
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 0147120edc01..5df4f97a017b 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -7,8 +7,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.3.7.2
-PORTREVISION=	2
+PORTVERSION=	2.3.8
 CATEGORIES=	mail ipv6
 MASTER_SITES=	https://dovecot.org/releases/2.3/
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index d0bd6801671f..eb92e3469dbd 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567006255
-SHA256 (dovecot-2.3.7.2.tar.gz) = 666ce084760a47e601d49a9be3c7993c48789d332631e8dfb45f443b367b1260
-SIZE (dovecot-2.3.7.2.tar.gz) = 7076231
+TIMESTAMP = 1570569851
+SHA256 (dovecot-2.3.8.tar.gz) = c5778d03bf26ab34a605854098035badec455d07adfab38d974f610c8f78b649
+SIZE (dovecot-2.3.8.tar.gz) = 7136958
diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist
index c5152336d5f3..eee72ae25fc4 100644
--- a/mail/dovecot/pkg-plist
+++ b/mail/dovecot/pkg-plist
@@ -49,6 +49,7 @@
 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0
 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0
 %%LIBWRAP%%libexec/dovecot/tcpwrap
+%%LUA_LIBDIR%%exec/dovecot/health-check.sh
 %%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.a
 %%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%01_mail_lua_plugin.so
 %%LUA%%%%LUA_LIBDIR%%/dovecot/%%LUA_LIBDIR%%22_push_notification_lua_plugin.a
@@ -589,6 +590,7 @@ include/dovecot/sha1.h
 include/dovecot/sha2.h
 include/dovecot/sha3.h
 include/dovecot/shared-storage.h
+include/dovecot/sleep.h
 include/dovecot/smtp-address.h
 include/dovecot/smtp-client-command.h
 include/dovecot/smtp-client-connection.h
@@ -861,4 +863,4 @@ man/man1/dsync.1.gz
 man/man7/doveadm-search-query.7.gz
 sbin/dovecot
 share/aclocal/dovecot.m4
-@postunexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
+@postunexec echo "If you are removing dovecot permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."