diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile
index df18a1751d92..4d134c394fc1 100644
--- a/mail/opensmtpd-devel/Makefile
+++ b/mail/opensmtpd-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opensmtpd
-PORTVERSION=	201606152203
+PORTVERSION=	201606220754
 DISTVERSIONSUFFIX=	p1
 PORTEPOCH=	1
 CATEGORIES=	mail
diff --git a/mail/opensmtpd-devel/distinfo b/mail/opensmtpd-devel/distinfo
index 2bcd71f6c039..616c94da5679 100644
--- a/mail/opensmtpd-devel/distinfo
+++ b/mail/opensmtpd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466396280
-SHA256 (opensmtpd-201606152203p1.tar.gz) = f91a91a6936bd634ba0643dea91b189d454b03d3c454f38f365bf73921aaf222
-SIZE (opensmtpd-201606152203p1.tar.gz) = 692715
+TIMESTAMP = 1466588486
+SHA256 (opensmtpd-201606220754p1.tar.gz) = 4057ab61396b0a9de50fb2087aac3997757fa95f49de5d71db3a8ad49a9ae163
+SIZE (opensmtpd-201606220754p1.tar.gz) = 692879
diff --git a/mail/opensmtpd-devel/files/pkg-message.in b/mail/opensmtpd-devel/files/pkg-message.in
index 0277388871f1..a4380df28324 100644
--- a/mail/opensmtpd-devel/files/pkg-message.in
+++ b/mail/opensmtpd-devel/files/pkg-message.in
@@ -1,18 +1,21 @@
-If you are upgrading from OpenSMTPD version 201303011853 or earlier, please
+If you are upgrading from OpenSMTPD version 5.7.3/201303011853 or earlier, please
 follow the procedure below to update the permissions on the OpenSMTPD
 spool directories:
 
   1. Stop 'smtpd' service:
 
-     # %%PREFIX%%/etc/rc.d/smtpd stop
+     # service smtpd stop
 
   2. Update permissions:
 
      # chown -R _smtpq:wheel /var/spool/smtpd/corrupt
+     # chown -R root:_smtpq /var/spool/smtpd/offline
      # chown -R _smtpq:wheel /var/spool/smtpd/purge
      # chown -R _smtpq:wheel /var/spool/smtpd/queue
      # chown -R _smtpq:wheel /var/spool/smtpd/temporary
+     # chmod -R 770 /var/spool/smtpd/offline
+     # chmod -R 700 /var/spool/smtpd/purge
 
   3. Start 'smtpd' service:
 
-     # %%PREFIX%%/etc/rc.d/smtpd start
+     # service smtpd start