diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile
index 3c8cd2da87f2..12a5bb45c616 100644
--- a/www/adguardhome/Makefile
+++ b/www/adguardhome/Makefile
@@ -1,49 +1,53 @@
 
 PORTNAME=	adguardhome
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.105.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Network-wide ads & trackers blocking DNS server
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		go:modules
 
 GO_MODULE=	github.com/AdguardTeam/AdGuardHome
 
 # to rebuild the deps archives:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum patch build
 #   3. upload the *-html-build* archives
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
+USER=		root # it has to run as root because it listens on the privileged DNS port
+SUB_LIST=	USER=${USER}
+USE_RC_SUBR=	${PORTNAME}
+
 .if (${DEV_UPDATE_MODE} == "yes")
 BUILD_DEPENDS=	npm:www/npm \
 		yarn:www/yarn
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} js-deps js-build && \
 		${TAR} czf ${DISTDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} build && \
 		${TAR} czf ${DISTDIR}/${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX} build2 && \
 		${ECHO} "Please upload files ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} and ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}"
 .else
 MASTER_SITES=	LOCAL/yuri/:deps
 DISTFILES=	${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX}:deps \
 		${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}:deps
 EXTRACT_ONLY=	${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-html-build2-${DISTVERSION}${EXTRACT_SUFX}
 
 pre-build:
 	@${CP} -r ${WRKDIR}/build ${WRKDIR}/build2 ${WRKSRC}/
 .endif
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/adguardhome/files/adguardhome.in b/www/adguardhome/files/adguardhome.in
new file mode 100644
index 000000000000..902745da6a35
--- /dev/null
+++ b/www/adguardhome/files/adguardhome.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# PROVIDE: adguardhome
+# REQUIRE: DAEMON NETWORKING
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable adguardhome:
+# adguardhome_enable : set to "YES" to enable the daemon, default is "NO"
+
+. /etc/rc.subr
+
+name=adguardhome
+rcvar=adguardhome_enable
+
+load_rc_config $name
+
+adguardhome_enable=${adguardhome_enable:-"NO"}
+
+logfile="/var/log/${name}.log"
+
+procname=%%PREFIX%%/bin/adguardhome
+command="/usr/sbin/daemon"
+command_args="-u %%USER%% -o ${logfile} -t ${name} %%PREFIX%%/bin/adguardhome"
+
+run_rc_command "$1"
diff --git a/www/adguardhome/pkg-message b/www/adguardhome/pkg-message
new file mode 100644
index 000000000000..1a789dcbcb7b
--- /dev/null
+++ b/www/adguardhome/pkg-message
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+You installed AdGuardHome: Network-wide ads & trackers blocking DNS server.
+
+In order to use it please start the service 'adguardhome' and
+then access the URL http://0.0.0.0:3010/ in your favorite browser.
+
+EOM
+}
+]