diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 2fd40d8400c2..870652f38327 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.1
+DISTVERSION=	2.8.4
 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 256c9559f39d..1b9ad5963b44 100644
--- a/www/caddy/distinfo
+++ b/www/caddy/distinfo
@@ -1,5 +1,5 @@
-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
+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