diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile
index 87271aa6f1a2..122447837aa3 100644
--- a/www/caddy-custom/Makefile
+++ b/www/caddy-custom/Makefile
@@ -1,49 +1,49 @@
 # READ pkg-descr FOR INSTRUCTIONS!
 # This port will NOT build in poudriere without (simple) manual
 # intervention.
 
 PORTNAME=	caddy-custom
 PORTVERSION=	${CADDY_VERSION}.${XCADDY_VERSION}
-PORTREVISION=	4
 CATEGORIES=	www
 DISTFILES=	# none
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Caddy (www/caddy) with customized plugins
 WWW=		https://caddyserver.com
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	xcaddy:www/xcaddy
 
 USES=		go:no_targets
 
 NO_PACKAGE=	Requires network access (see pkg-descr)
 
 CONFLICTS_INSTALL=	caddy
 
 USE_RC_SUBR=	caddy
 SUB_FILES=	caddy
 
 PLIST_FILES=	bin/caddy
 
 CADDY_VERSION!=	${MAKE} -C ${.CURDIR}/../caddy  -V '$${DISTVERSION}.$${PORTREVISION}'
+CADDY_DISTVERSION!=	${MAKE} -C ${.CURDIR}/../caddy  -V '$${DISTVERSION}'
 XCADDY_VERSION!=${MAKE} -C ${.CURDIR}/../xcaddy -V '$${DISTVERSION}.$${PORTREVISION}'
 
 .for plugin in ${CADDY_CUSTOM_PLUGINS}
 PLUGINS+=	--with ${plugin}
 .endfor
 
 XCADDY_GO_BUILD_FLAGS?=	${GO_BUILDFLAGS}
 
 XCADDY_ENV+=	XCADDY_WHICH_GO="${GO_CMD}" \
 		XCADDY_GO_BUILD_FLAGS="${XCADDY_GO_BUILD_FLAGS}"
 
 do-build:
 	${MKDIR} ${WRKSRC}
-	cd ${WRKSRC} && ${XCADDY_ENV} ${LOCALBASE}/bin/xcaddy build ${PLUGINS}
+	cd ${WRKSRC} && ${XCADDY_ENV} ${LOCALBASE}/bin/xcaddy build v${CADDY_DISTVERSION} ${PLUGINS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/caddy ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index e136b1a7360b..470be85b5d93 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.4
-PORTREVISION=	4
+DISTVERSION=	2.9.0
 CATEGORIES=	www
 DIST_SUBDIR=	caddy
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Fast, cross-platform HTTP/2 web server with automatic HTTPS
 WWW=		https://caddyserver.com
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:modules
 CPE_VENDOR=	caddyserver
 
 USERS=		www
 GROUPS=		www
 
 USE_RC_SUBR=	caddy
 SUB_FILES=	Caddyfile.sample caddy pkg-message
 
 CONFLICTS_INSTALL=	caddy-custom
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample ${ETCDIR_REL}/Caddyfile.sample"
 
 GO_BUILDFLAGS+=	-ldflags='-X github.com/caddyserver/caddy/v2.CustomVersion=${DISTVERSIONFULL}'
 
 GO_TARGET=	./cmd/caddy
 # If go.mod is sufficient:
 GO_MODULE=	github.com/caddyserver/caddy/v2
 # If modules must be specified manually:
 #.include "${.CURDIR}/modules.mk"
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/Caddyfile.sample ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/www/caddy/distinfo b/www/caddy/distinfo
index 1b9ad5963b44..8bcafbac5383 100644
--- a/www/caddy/distinfo
+++ b/www/caddy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1717425625
-SHA256 (go/www_caddy/caddy-v2.8.4/v2.8.4.mod) = 55f7eec20f10f9bf117c58a4ff3b56bdf158cd5169f7e0a4853bf3417bb7022f
-SIZE (go/www_caddy/caddy-v2.8.4/v2.8.4.mod) = 6978
-SHA256 (go/www_caddy/caddy-v2.8.4/v2.8.4.zip) = b37b51736c50ba58f322f946d1f0ac194d459b3717c161e3369e908b6a89bd3f
-SIZE (go/www_caddy/caddy-v2.8.4/v2.8.4.zip) = 964910
+TIMESTAMP = 1735691490
+SHA256 (go/www_caddy/caddy-v2.9.0/v2.9.0.mod) = 7dadb54b56e01dabac3a915c5864bc5bc9232ba4d74dae46497ec1b2aee602c6
+SIZE (go/www_caddy/caddy-v2.9.0/v2.9.0.mod) = 7038
+SHA256 (go/www_caddy/caddy-v2.9.0/v2.9.0.zip) = 06b69ecb05a3af110a539eccc86e807365fba87ec9e680d473f07e4e50d8fb77
+SIZE (go/www_caddy/caddy-v2.9.0/v2.9.0.zip) = 1019659