diff --git a/www/caddy-custom/Makefile b/www/caddy-custom/Makefile
index 6c883c52a262..ead426cc20bc 100644
--- a/www/caddy-custom/Makefile
+++ b/www/caddy-custom/Makefile
@@ -1,49 +1,48 @@
 # 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=	17
 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}'
 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}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/caddy ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index c2712310ecc2..2fd40d8400c2 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7.6
-PORTREVISION=	6
+DISTVERSION=	2.8.1
 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 7ccfff8cfacb..256c9559f39d 100644
--- a/www/caddy/distinfo
+++ b/www/caddy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1702005576
-SHA256 (go/www_caddy/caddy-v2.7.6/v2.7.6.mod) = 97c0afe65cb83f63b3984b7a6cc310e3e6c74b5411381d86d9e652e9f847b105
-SIZE (go/www_caddy/caddy-v2.7.6/v2.7.6.mod) = 6843
-SHA256 (go/www_caddy/caddy-v2.7.6/v2.7.6.zip) = 468f7bec63932292a686d368ed6bd3c92d823f3c5c749d4d1bc7513419aa33b6
-SIZE (go/www_caddy/caddy-v2.7.6/v2.7.6.zip) = 868020
+TIMESTAMP = 1717208753
+SHA256 (go/www_caddy/caddy-v2.8.1/v2.8.1.mod) = 5ef5e4b07d8633d1992fac812fac53a9b70bc4f7680a1814ac17c15e463773a6
+SIZE (go/www_caddy/caddy-v2.8.1/v2.8.1.mod) = 6978
+SHA256 (go/www_caddy/caddy-v2.8.1/v2.8.1.zip) = 5915c44010dff29d3dc82e2d9a061a96851bfad45d151cab624d3a17a67b1b72
+SIZE (go/www_caddy/caddy-v2.8.1/v2.8.1.zip) = 964146