diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 6542a0dc3545..dbced0d7e0a1 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,56 +1,55 @@
 PORTNAME=	consul
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.3
-PORTREVISION=	2
+DISTVERSION=	2.0.4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/consul/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
 		api/go.mod \
 		envoyextensions/go.mod \
 		proto-public/go.mod \
 		sdk/go.mod \
 		troubleshoot/go.mod
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
 WWW=		https://www.consul.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:1.26+,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RC_SUBR=	consul
 
 GO_MODULE=	github.com/hashicorp/consul
 GO_BUILDFLAGS=	-ldflags="-s \
 		-X github.com/hashicorp/consul/version.GitCommit=${GITID} \
 		-X github.com/hashicorp/consul/version.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}} \
 		"
 
 ETCDIR=		${PREFIX}/etc/consul.d
 SUB_LIST=	CONSUL_DBDIR=${CONSUL_DBDIR} \
 		GROUP=${CONSUL_GROUP} \
 		USER=${CONSUL_USER}
 
 USERS=		${CONSUL_USER}
 GROUPS=		${CONSUL_GROUP}
 
 PLIST_FILES=	bin/consul
 
 CONSUL_USER?=	consul
 CONSUL_GROUP?=	consul
 CONSUL_DBDIR?=	/var/db/${PORTNAME}
 
-GITID=		d0f2be9
+GITID=		a3eb721
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 .include <bsd.port.pre.mk>
 
 SOURCE_DATE_EPOCH_CMD=	date -ur \
 			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
 			'+%Y-%m-%dT%H:%M:%SZ'
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/consul/distinfo b/sysutils/consul/distinfo
index 8a0f261d598f..e347c4ab26b9 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1786815884
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/go.mod) = 0fb41dc98fa5dbe7b4103dc2fd95110023b951f6c0c3b44a24991f10847ed548
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/go.mod) = 15329
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/api/go.mod) = a06d6b434024b86864a387eeca3916c213a48dbc53ab59461df56d2edd1ee460
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/api/go.mod) = 2083
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/envoyextensions/go.mod) = a9fa33b99a4e02d2303316f8cf212fe2c80216462ef581265a51a123bcb45d1b
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/envoyextensions/go.mod) = 2181
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/proto-public/go.mod) = 72de2f6a41b44bc5875b6e6e0fe6accbb3aa6a12075e3b976443f1bf90c6326f
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/proto-public/go.mod) = 447
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/sdk/go.mod) = 30a259d1e01ea5e3a8462e7d46020369865b9af6609f2c0125a5b2e8e2b3ff1a
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/sdk/go.mod) = 823
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/troubleshoot/go.mod) = 86b1de4d01b9160abcce5b5b7b8c059257f144d6a420843a7cbf7cfa27697c30
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/troubleshoot/go.mod) = 3068
-SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/hashicorp-consul-v2.0.3_GH0.tar.gz) = d91f6f99338216f9fbbe3035f67debb990f5fa49f8c554281ee5c4c352e69019
-SIZE (go/sysutils_consul/hashicorp-consul-v2.0.3_GH0/hashicorp-consul-v2.0.3_GH0.tar.gz) = 10998231
+TIMESTAMP = 1789215839
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/go.mod) = 3077ec42a152edcddd851d2ba86b9eb7fe3446fe6ac69396b6a62526b5d74977
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/go.mod) = 15329
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/api/go.mod) = 770cf9f607af3128b2c7485dc8ab8280bc60bfda2224098d30f170ed016096a4
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/api/go.mod) = 2083
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/envoyextensions/go.mod) = 3d6f1fe2bd4a02d9cd41ca0497366a2ebe1f3b4870e78a8330e6f6ad17e16455
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/envoyextensions/go.mod) = 2181
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/proto-public/go.mod) = 12e03152f5248b639a2487bc687b1f0304b9f4285bad28493c52a8e060dffe5e
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/proto-public/go.mod) = 447
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/sdk/go.mod) = 18e5fcce54ffaf3f2a528b971a364566d63bf40b3b73b3186ee9e908d3569812
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/sdk/go.mod) = 823
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/troubleshoot/go.mod) = d4e4cbabe8ebeab2ae2545d687ba762b9f521b8baaf1d2c6a415c93e236a5535
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/troubleshoot/go.mod) = 3022
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/hashicorp-consul-v2.0.4_GH0.tar.gz) = 4923b2481a11d9b1923106b5eaf10b8e32a5edd45a41046d0a9419dc5abc10a7
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.4_GH0/hashicorp-consul-v2.0.4_GH0.tar.gz) = 11051627