diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile
index 9ec8a405de12..2643505f09a9 100644
--- a/www/adguardhome/Makefile
+++ b/www/adguardhome/Makefile
@@ -1,57 +1,56 @@
 PORTNAME=	adguardhome
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.107.36
-PORTREVISION=	2
+DISTVERSION=	0.107.40
 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.19,modules
+USES=		cpe go:1.20,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 build
 #   3. upload the *-html-{build,client}* 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
 GROUP=		wheel
 SUB_LIST=	USER=${USER} GROUP=${GROUP}
 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-client-${DISTVERSION}${EXTRACT_SUFX} client && \
 		${ECHO} "Please upload files ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX} and ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX}"
 .else
 MASTER_SITES=	LOCAL/yuri/:deps
 DISTFILES=	${PORTNAME}-html-build-${DISTVERSION}${EXTRACT_SUFX}:deps \
 		${PORTNAME}-html-client-${DISTVERSION}${EXTRACT_SUFX}:deps
 
 pre-build:
 	@${CP} -r ${WRKDIR}/build ${WRKDIR}/client ${WRKSRC}/
 .endif
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/adguardhome/distinfo b/www/adguardhome/distinfo
index 4f9108a39540..fc89dced7bce 100644
--- a/www/adguardhome/distinfo
+++ b/www/adguardhome/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1691123230
-SHA256 (go/www_adguardhome/adguardhome-v0.107.36/adguardhome-html-build-0.107.36.tar.gz) = 083128d363433c83a2beeebd3b9bc7c85133cd36b80966b8240592c9c2bfb7e1
-SIZE (go/www_adguardhome/adguardhome-v0.107.36/adguardhome-html-build-0.107.36.tar.gz) = 2704674
-SHA256 (go/www_adguardhome/adguardhome-v0.107.36/adguardhome-html-client-0.107.36.tar.gz) = 889b39e79ab085ead9a60d3fd80fae1c99308f2026284e6d9729b0d6bd5282fb
-SIZE (go/www_adguardhome/adguardhome-v0.107.36/adguardhome-html-client-0.107.36.tar.gz) = 36144216
-SHA256 (go/www_adguardhome/adguardhome-v0.107.36/v0.107.36.mod) = fd3a2e739915ebbc6747921100634abaad951fc6fb5884ff04ea35d0348b263d
-SIZE (go/www_adguardhome/adguardhome-v0.107.36/v0.107.36.mod) = 2849
-SHA256 (go/www_adguardhome/adguardhome-v0.107.36/v0.107.36.zip) = c42f1cd0e1e4b4b1ad0cd71c9810bfec8f5629f7726048937659cf9991be5b5c
-SIZE (go/www_adguardhome/adguardhome-v0.107.36/v0.107.36.zip) = 2219176
+TIMESTAMP = 1697695863
+SHA256 (go/www_adguardhome/adguardhome-v0.107.40/adguardhome-html-build-0.107.40.tar.gz) = fdf46802bd7b9641414f7cb08ad494aaa9211d184ea333b120361e54a31c3993
+SIZE (go/www_adguardhome/adguardhome-v0.107.40/adguardhome-html-build-0.107.40.tar.gz) = 2769332
+SHA256 (go/www_adguardhome/adguardhome-v0.107.40/adguardhome-html-client-0.107.40.tar.gz) = 91e152d67c9e2bef3839b621d38edefdb5c3ac9da08dcb6ceaeaa030d60d454a
+SIZE (go/www_adguardhome/adguardhome-v0.107.40/adguardhome-html-client-0.107.40.tar.gz) = 36769879
+SHA256 (go/www_adguardhome/adguardhome-v0.107.40/v0.107.40.mod) = 55c225876adbedc9d18ee9dd9822684fe062c85c79a45e7351881b9b84b9b5ab
+SIZE (go/www_adguardhome/adguardhome-v0.107.40/v0.107.40.mod) = 2567
+SHA256 (go/www_adguardhome/adguardhome-v0.107.40/v0.107.40.zip) = ea0388b55abaaf4927686c3d07a48c940c25feeda0abb7f687734236ed9413e0
+SIZE (go/www_adguardhome/adguardhome-v0.107.40/v0.107.40.zip) = 2563152