diff --git a/dns/inadyn/Makefile b/dns/inadyn/Makefile
index a23046619979..abc44df60198 100644
--- a/dns/inadyn/Makefile
+++ b/dns/inadyn/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	inadyn
 PORTVERSION=	2.11.0
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/troglobit/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Dynamic DNS update client
 WWW=		https://troglobit.com/projects/inadyn/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libconfuse.so:devel/libconfuse
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		pkgconfig tar:xz
 
 GNU_CONFIGURE=	yes
 
 USERS=		inadyn
 GROUPS=		inadyn
 
 USE_RC_SUBR=	inadyn
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SINGLE=		TLS
 OPTIONS_SINGLE_TLS=	GNUTLS OPENSSL
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ENABLE=	openssl
 OPENSSL_CONFIGURE_ON=	OpenSSL_CFLAGS=-I${OPENSSLINC} OpenSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \
 		${WRKSRC}/man/inadyn.8 ${WRKSRC}/man/inadyn.conf.5 \
 		${WRKSRC}/examples/README.md ${WRKSRC}/examples/inadyn.conf
 
 post-install:
 	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/inadyn.conf ${STAGEDIR}${PREFIX}/etc/inadyn.conf.sample
 	${MKDIR} ${STAGEDIR}/var/cache/inadyn
 	${MKDIR} ${STAGEDIR}/var/run/inadyn
 
 .include <bsd.port.mk>
diff --git a/dns/inadyn/files/inadyn.in b/dns/inadyn/files/inadyn.in
index 2c1a77815724..a5bf457e9ce4 100644
--- a/dns/inadyn/files/inadyn.in
+++ b/dns/inadyn/files/inadyn.in
@@ -1,45 +1,50 @@
 #!/bin/sh
 
 # PROVIDE: inadyn
 # REQUIRE: NETWORKING
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # inadyn_enable (bool):		Set it to "YES" to enable inadyn
 #				Default is "NO"
 # inadyn_config (str):		Set full path to configuration file.
 #				Default is "%%PREFIX%%/etc/inadyn.conf"
 # inadyn_pidfile (str):		Set full path to pid file.
 #				Default is "/var/run/inadyn/inadyn.pid"
 #
 
 . /etc/rc.subr
 
 name="inadyn"
 rcvar=inadyn_enable
 
 start_precmd="inadyn_checkconfig"
 restart_precmd="inadyn_checkconfig"
 configtest_precmd="inadyn_checkconfig"
 extra_commands="configtest"
 
 load_rc_config $name
 
 : ${inadyn_enable:="NO"}
 : ${inadyn_config:="%%PREFIX%%/etc/inadyn.conf"}
 : ${inadyn_pidfile:="/var/run/inadyn/inadyn.pid"}
 
 command=%%PREFIX%%/sbin/inadyn
 command_args="-p inadyn:inadyn -f ${inadyn_config} -P ${inadyn_pidfile}"
 pidfile=${inadyn_pidfile}
 required_files=${inadyn_config}
 
 inadyn_checkconfig()
 {
 	echo "Performing sanity check on ${name} configuration:"
 	eval ${command} ${command_args} --check-config
+	piddir="$(dirname ${pidfile})"
+	if [ ! -d "${piddir}" ] && id inadyn >/dev/null 2>&1 ; then
+		mkdir -p "${piddir}"
+		chown inadyn:inadyn "${piddir}"
+	fi
 }
 
 run_rc_command "$1"