diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile
index 08000aa57131..aa0996e711ef 100644
--- a/www/adguardhome/Makefile
+++ b/www/adguardhome/Makefile
@@ -1,56 +1,55 @@
 PORTNAME=	adguardhome
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.107.15
-PORTREVISION=	2
+DISTVERSION=	0.107.21
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Network-wide ads & trackers blocking DNS server
 WWW=		https://adguard.com/en/adguard-home/overview.html
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:1.18,modules
 
 GO_MODULE=	github.com/AdguardTeam/AdGuardHome
 GO_BUILDFLAGS=  -ldflags="-s -w -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${DISTVERSION}" # workaround for https://github.com/AdguardTeam/AdGuardHome/issues/4774
 
 # 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}
 
 CPE_VENDOR=	adguard
 
 .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}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} build && \
 		${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${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
 
 pre-build:
 	@${CP} -r ${WRKDIR}/build ${WRKDIR}/build2 ${WRKSRC}/
 .endif
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/adguardhome/distinfo b/www/adguardhome/distinfo
index 0a8eccc2da91..c1707d31cbe5 100644
--- a/www/adguardhome/distinfo
+++ b/www/adguardhome/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1664983870
-SHA256 (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build-0.107.15.tar.gz) = 0cb96c994f3d4424c6b1b1b15321ff883b7a4ef51884360f8d7648de675c1ce2
-SIZE (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build-0.107.15.tar.gz) = 2613058
-SHA256 (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build2-0.107.15.tar.gz) = 04351b5e34f22778271926c1ac04d417af2a6cd9db74c433a786fd3dbee36b74
-SIZE (go/www_adguardhome/adguardhome-v0.107.15/adguardhome-html-build2-0.107.15.tar.gz) = 2414271
-SHA256 (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.mod) = 84b710f63ae6c291d965379c4cd1f970e6027c290629ebe9986055edcade7b45
-SIZE (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.mod) = 2828
-SHA256 (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.zip) = e9ca3041e8190b1d43224320798450040c6eeb80c7c7c42ced3be30028ab2fa6
-SIZE (go/www_adguardhome/adguardhome-v0.107.15/v0.107.15.zip) = 2392581
+TIMESTAMP = 1671401204
+SHA256 (go/www_adguardhome/adguardhome-v0.107.21/adguardhome-html-build-0.107.21.tar.gz) = 0e59950df1c4fe7364106774f2a412e0661f6b10e9e1fa1e119e39f9fdbed50b
+SIZE (go/www_adguardhome/adguardhome-v0.107.21/adguardhome-html-build-0.107.21.tar.gz) = 2616034
+SHA256 (go/www_adguardhome/adguardhome-v0.107.21/adguardhome-html-build2-0.107.21.tar.gz) = a5ffdecf652c595685861d29e35db097182863fdef5cf177ea4d844bf3bf09b8
+SIZE (go/www_adguardhome/adguardhome-v0.107.21/adguardhome-html-build2-0.107.21.tar.gz) = 2414219
+SHA256 (go/www_adguardhome/adguardhome-v0.107.21/v0.107.21.mod) = 7ca708395f842f487c1ebbe09aa78dee58276d652814a6d6df5ad027b7525d82
+SIZE (go/www_adguardhome/adguardhome-v0.107.21/v0.107.21.mod) = 2648
+SHA256 (go/www_adguardhome/adguardhome-v0.107.21/v0.107.21.zip) = 7c24d4e3488208d38003db8fd6089e0c0322019ebd1639062b46ee800a670aeb
+SIZE (go/www_adguardhome/adguardhome-v0.107.21/v0.107.21.zip) = 2435809