diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index 6fef82b70afb..272e2ba54a1b 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,38 +1,37 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.6.1
-PORTREVISION=	4
+DISTVERSION=	2.6.2
 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
 
 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.VersionString=${DISTVERSIONFULL}'
+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 3144a7736936..0425720e9f14 100644
--- a/www/caddy/distinfo
+++ b/www/caddy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1663804054
-SHA256 (go/www_caddy/caddy-v2.6.1/v2.6.1.mod) = 5f51daa4f2300632f7c4c5f071bf7b699cb0e19d93531f09b2b29cfe5233cb0d
-SIZE (go/www_caddy/caddy-v2.6.1/v2.6.1.mod) = 6436
-SHA256 (go/www_caddy/caddy-v2.6.1/v2.6.1.zip) = 637444d478343e7db34be675f92b82afd8be52141d228ad48eaf2c436af4495c
-SIZE (go/www_caddy/caddy-v2.6.1/v2.6.1.zip) = 796937
+TIMESTAMP = 1665688601
+SHA256 (go/www_caddy/caddy-v2.6.2/v2.6.2.mod) = 66e3abc14121ef5b101c4eda4b796aeb885363cb5f24bc39f12f1a0d4059e860
+SIZE (go/www_caddy/caddy-v2.6.2/v2.6.2.mod) = 6406
+SHA256 (go/www_caddy/caddy-v2.6.2/v2.6.2.zip) = a26479dca70c6fb2e018043154c062a920085d8a6a7c24e9360edd24e16bbe17
+SIZE (go/www_caddy/caddy-v2.6.2/v2.6.2.zip) = 793368
diff --git a/www/caddy/files/patch-caddy.go b/www/caddy/files/patch-caddy.go
deleted file mode 100644
index bc79644ad6b7..000000000000
--- a/www/caddy/files/patch-caddy.go
+++ /dev/null
@@ -1,25 +0,0 @@
---- caddy.go.orig	2022-09-22 16:12:41 UTC
-+++ caddy.go
-@@ -824,6 +824,10 @@ func InstanceID() (uuid.UUID, error) {
- 	return uuid.ParseBytes(uuidFileBytes)
- }
- 
-+// VersionString uses a predefined version string to short-circuit
-+// the Version() function below, to simplify vendor packaging.
-+var VersionString string
-+
- // Version returns the Caddy version in a simple/short form, and
- // a full version string. The short form will not have spaces and
- // is intended for User-Agent strings and similar, but may be
-@@ -841,6 +845,11 @@ func InstanceID() (uuid.UUID, error) {
- //
- // This function is experimental and subject to change or removal.
- func Version() (simple, full string) {
-+	// Use VersionString if provided (eg. through -ldflags -X)
-+	if VersionString != "" {
-+		return VersionString, VersionString
-+	}
-+
- 	// the currently-recommended way to build Caddy involves
- 	// building it as a dependency so we can extract version
- 	// information from go.mod tooling; once the upstream