diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile
index f4238214f57e..e4a5705f088d 100644
--- a/mail/mailfromd/Makefile
+++ b/mail/mailfromd/Makefile
@@ -1,75 +1,75 @@
 PORTNAME=	mailfromd
-PORTVERSION=	8.13
+PORTVERSION=	8.14
 CATEGORIES=	mail
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
 
 MAINTAINER=	zeus@gnu.org.ua
 COMMENT=	Mail filtering daemon for Sendmail, Postfix, and MeTA1
 WWW=		https://puszcza.gnu.org.ua/software/mailfromd/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libmailutils.so:mail/mailutils \
 		libadns.so:dns/adns \
 		libgmp.so:math/gmp \
 		libgnutls.so:security/gnutls \
 		libnettle.so:security/nettle
 
 USES=		gmake localbase readline tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog-async
 CONFIGURE_ENV=	DEFAULT_STATE_DIR="${DATABASEDIR}" \
 		DEFAULT_SOCKET="unix:${MFD_RUN_DIR}/${PORTNAME}.sock" \
 		DEFAULT_USER=mailnull
 USE_RC_SUBR=	calloutd ${PORTNAME}
 TEST_TARGET=	check
 
 DATABASEDIR?=	/var/db/${PORTNAME}
 MFD_RUN_DIR?=	/var/run/${PORTNAME}
 
 PLIST_SUB+=	DATABASEDIR=${DATABASEDIR} \
 		MFD_RUN_DIR=${MFD_RUN_DIR} \
 		VERSION=${PORTVERSION}
 SUB_LIST+=	MFD_RUN_DIR=${MFD_RUN_DIR}
 
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README THANKS TODO
 
 OPTIONS_DEFINE=		DOCS DSPAM NLS
 OPTIONS_DEFAULT=	GDBM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM
 OPTIONS_SUB=		yes
 
 BDB_DESC=		Berkeley DB v4.8 support (last working one)
 DB_DESC=		Database configuration
 
 DSPAM_DESC=		DSPAM spam filter library support
 DSPAM_LIB_DEPENDS=	libdspam.so:mail/dspam
 DSPAM_USES=		pkgconfig
 DSPAM_CONFIGURE_WITH=	dspam
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 BDB_USES=		bdb
 BDB_CONFIGURE_WITH=	berkeley-db
 BDB_CPPFLAGS=		-I${BDB_INCLUDE_DIR}
 BDB_LDFLAGS=		-L${BDB_LIB_DIR}
 
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 GDBM_CONFIGURE_WITH=	gdbm
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATABASEDIR} ${STAGEDIR}${MFD_RUN_DIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mailfromd/distinfo b/mail/mailfromd/distinfo
index 9ddf6e212be1..a2181241bb6d 100644
--- a/mail/mailfromd/distinfo
+++ b/mail/mailfromd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641130380
-SHA256 (mailfromd-8.13.tar.xz) = 3d578a7efae8477471daf57d41959cd94e5f6f59802578f6d2fc3c625f7b7585
-SIZE (mailfromd-8.13.tar.xz) = 1163284
+TIMESTAMP = 1660381483
+SHA256 (mailfromd-8.14.tar.xz) = 428caf1f7356b7da3a7614f5f5f47f108bf94149ab1db8c0023f1593b837bd31
+SIZE (mailfromd-8.14.tar.xz) = 1180996
diff --git a/mail/mailfromd/files/calloutd.in b/mail/mailfromd/files/calloutd.in
index 0b6b5be9602d..d1832b792c06 100644
--- a/mail/mailfromd/files/calloutd.in
+++ b/mail/mailfromd/files/calloutd.in
@@ -1,25 +1,26 @@
 #!/bin/sh
-
+#
 # PROVIDE: calloutd
 # REQUIRE: DAEMON
 # BEFORE: mail
 # KEYWORD: shutdown
 #
 
 . /etc/rc.subr
 
 name="calloutd"
 rcvar=calloutd_enable
 
 : ${calloutd_enable="NO"}
+: ${mailfromd_runpath="%%MFD_RUN_DIR%%"}
 
 command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="${mailfromd_runpath}/${name}.pid"
 
 required_files="%%PREFIX%%/etc/mailfromd.conf"
 
 extra_commands="configlint"
 configlint_cmd="${name} --config-lint"
 
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/mail/mailfromd/files/mailfromd.in b/mail/mailfromd/files/mailfromd.in
index 56e6bddeaf4d..f3078c82fef7 100644
--- a/mail/mailfromd/files/mailfromd.in
+++ b/mail/mailfromd/files/mailfromd.in
@@ -1,22 +1,22 @@
 #!/bin/sh
-
+#
 # PROVIDE: mailfromd
 # REQUIRE: DAEMON
 # BEFORE: mail
 # KEYWORD: shutdown
 #
 
 . /etc/rc.subr
 
 name="mailfromd"
 rcvar=mailfromd_enable
-command="%%PREFIX%%/sbin/${name}"
-
-load_rc_config ${name}
 
 : ${mailfromd_enable="NO"}
 : ${mailfromd_flags}
 : ${mailfromd_runpath="%%MFD_RUN_DIR%%"}
+
+command="%%PREFIX%%/sbin/${name}"
 pidfile="${mailfromd_runpath}/${name}.pid"
 
+load_rc_config ${name}
 run_rc_command "$1"