diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 4af43abe3dd5..d9b5d263c83f 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,56 +1,55 @@
 PORTNAME=	consul
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.22.7
-PORTREVISION=	1
+DISTVERSION=	2.0.0
 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.25+,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=		c18bcb9
+GITID=		1b36932
 
 # 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 631f3d0f3718..205193f29e81 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1777227803
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/go.mod) = afac855217e4e88a948481cee444a56eda90105fcc4204a7afbd74b93ff120ab
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/go.mod) = 14608
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/api/go.mod) = c9854194a0b2377c6f09216d0fd1a1a9bd92ba34b81c2144fe35ab3ae010c7c4
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/api/go.mod) = 1910
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/envoyextensions/go.mod) = 18e124a8ca51f12333b927643a3374840ffcbf0f8b95442403f43440afc894f3
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/envoyextensions/go.mod) = 2129
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/proto-public/go.mod) = 432db15c0b5ed3da81208cb1e51cc7a79df4ce4ea16d07b3c57a359aa972aebf
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/proto-public/go.mod) = 344
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/sdk/go.mod) = 116072d24eaf6ce700e3707b0031f798aa1a8c76b3d9859235265c03e9e73f4d
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/sdk/go.mod) = 822
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/troubleshoot/go.mod) = 775dee7d00202cf9ccdfcd6446d15d7f7b8296b7afb92cb0ab7f82eadb4e3fdd
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/troubleshoot/go.mod) = 2916
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/hashicorp-consul-v1.22.7_GH0.tar.gz) = abd65c1db151c89560e1f2db1d2cb02abd7eaa7446f1a2985eedb01dac624ffc
-SIZE (go/sysutils_consul/hashicorp-consul-v1.22.7_GH0/hashicorp-consul-v1.22.7_GH0.tar.gz) = 13651474
+TIMESTAMP = 1779656198
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/go.mod) = 4138492ae0dfa3d3dab1584609ae676fa25a64301718161ad1a60522cfd9085e
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/go.mod) = 14449
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/api/go.mod) = f71fe9add6db840fcffe9277e4f4de8dc74a11b6ff425ad8fe35da45732bf894
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/api/go.mod) = 1908
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/envoyextensions/go.mod) = d683d5f22350f3f3ea4bb8e3d924cb46934d02733196f7b2872cee4ccce7b1de
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/envoyextensions/go.mod) = 2127
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/proto-public/go.mod) = 7f77a6f3da0ff958513f334a45302f3df032d8d1fb3a66764f7f23ba2c2a3ba7
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/proto-public/go.mod) = 388
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/sdk/go.mod) = d2030a8c8c89ea84cb5afcf06d4ea44e9490e0b235054d60101c6015fc5dc170
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/sdk/go.mod) = 820
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/troubleshoot/go.mod) = c25b12bb1efc875ecff9ae6c00072cdb10d7ae4023e59b9ff105dd8e0c1a8d38
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/troubleshoot/go.mod) = 3014
+SHA256 (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/hashicorp-consul-v2.0.0_GH0.tar.gz) = cf0fb38b3150cc5be4e0e05d0ecfd9198e427725b8262a43396707b76193f3c7
+SIZE (go/sysutils_consul/hashicorp-consul-v2.0.0_GH0/hashicorp-consul-v2.0.0_GH0.tar.gz) = 10929400