diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 559c3a6afc2c..6b22a573e554 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,41 +1,35 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.11.3
-PORTREVISION=	1
+DISTVERSION=	2.11.4
 CATEGORIES=	www
 DIST_SUBDIR=	caddy
 
 MAINTAINER=	adamw@FreeBSD.org
-COMMENT=	Fast, cross-platform HTTP/2 web server with automatic HTTPS
+COMMENT=	Fast, highly configurable HTTP/1-2-3 web server with automatic TLS
 WWW=		https://caddyserver.com
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:1.25+,modules
 CPE_VENDOR=	caddyserver
+USE_RC_SUBR=	caddy
 
-USERS=		www
-GROUPS=		www
+GO_MODULE=	github.com/caddyserver/caddy/v2
+GO_TARGET=	./cmd/caddy
+GO_BUILDFLAGS+=	-ldflags='-X github.com/caddyserver/caddy/v2.CustomVersion=${DISTVERSIONFULL}'
 
-USE_RC_SUBR=	caddy
+CONFLICTS_INSTALL=	caddy-custom
 SUB_FILES=	Caddyfile.sample caddy pkg-message
 
-CONFLICTS_INSTALL=	caddy-custom
+USERS=		www
+GROUPS=		www
 
 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 3bef4750a824..d1bf03fbd198 100644
--- a/www/caddy/distinfo
+++ b/www/caddy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1778613599
-SHA256 (go/www_caddy/caddy-v2.11.3/v2.11.3.mod) = 19cdb07a4beaea95fada10d0ed3988fcf34c6a2c77c3c92541ca84093d67a1fe
-SIZE (go/www_caddy/caddy-v2.11.3/v2.11.3.mod) = 8465
-SHA256 (go/www_caddy/caddy-v2.11.3/v2.11.3.zip) = bb6f8dc1d3cb7a82f4194d59dbcd672f5af26ede2c0539352473fc1fd5c44a5a
-SIZE (go/www_caddy/caddy-v2.11.3/v2.11.3.zip) = 1222729
+TIMESTAMP = 1781388840
+SHA256 (go/www_caddy/caddy-v2.11.4/v2.11.4.mod) = 2ce7537aecbdaf5b2fe42bf0cc42f2d7e7ce5e4186aab3586b736a53f5937abd
+SIZE (go/www_caddy/caddy-v2.11.4/v2.11.4.mod) = 8465
+SHA256 (go/www_caddy/caddy-v2.11.4/v2.11.4.zip) = 110eea53c3005d327a092d83fc67ae2a270a08c4a001e52bb2a439a163a872e8
+SIZE (go/www_caddy/caddy-v2.11.4/v2.11.4.zip) = 1234977
diff --git a/www/caddy/modules.mk b/www/caddy/modules.mk
deleted file mode 100644
index 074077f5c5f0..000000000000
--- a/www/caddy/modules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Use this file if we need to manually specify or override module dependencies.
-# USE_GITHUB=	yes
-# GH_ACCOUNT=	caddyserver
-# GH_TUPLE=	<...>