diff --git a/mail/postsrsd/Makefile b/mail/postsrsd/Makefile
index fa5c60ce3349..d5c74d6fdbb0 100644
--- a/mail/postsrsd/Makefile
+++ b/mail/postsrsd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	postsrsd
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	ports@bsdserwis.com
@@ -11,9 +12,7 @@ COMMENT=	Postfix Sender Rewriting Scheme daemon
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	help2man:misc/help2man \
-		base64:converters/base64
-RUN_DEPENDS=	base64:converters/base64
+BUILD_DEPENDS=	help2man:misc/help2man
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	roehling
@@ -28,7 +27,7 @@ PORTDOCS=	README.md main.cf.ex README_UPGRADE.md
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_CMAKE_ON=	-DENABLE_DOCS:STRING="ON"
+DOCS_CMAKE_BOOL=	ENABLE_DOCS
 
 PLIST_FILES=	sbin/postsrsd man/man8/postsrsd.8.gz
 
diff --git a/mail/postsrsd/files/postsrsd.in b/mail/postsrsd/files/postsrsd.in
index ca0190588306..17c3d00cd415 100644
--- a/mail/postsrsd/files/postsrsd.in
+++ b/mail/postsrsd/files/postsrsd.in
@@ -71,7 +71,7 @@ postsrsd_prepcmd ()
 	chown ${postsrsd_uid} ${_piddir}
     fi
     if [ ! -f "${postsrsd_secret}" ] ; then
-	tr -cd "[:alnum:]" < /dev/urandom | head -c 24 > "${postsrsd_secret}"
+	env -i tr -cd "[:alnum:]" < /dev/urandom | head -c 24 > "${postsrsd_secret}"
     fi
 }