diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index ae4d9c7f619e..47a04a501a9e 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	consul
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.20.3
+DISTVERSION=	1.20.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.22,modules
+USES=		cpe go:1.23,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=		f47d74e
+GITID=		9e30877
 
 # 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 0d93ba82994d..de5b4be6d433 100644
--- a/sysutils/consul/distinfo
+++ b/sysutils/consul/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1739513461
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/go.mod) = f20b21344ae37b15067c8ce22dab02576dc6f50b3566445cadd449edf6617d6e
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/go.mod) = 13795
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/api/go.mod) = 26f33109ac4544c6cace28e9c2e1f63260c705d9f75f8f2a483f56f006e625e1
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/api/go.mod) = 1831
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/envoyextensions/go.mod) = 16e85e8cc4b613fe9bb1287ce8c46eff7ab5ced4b8b8dff6c5f4f398e6e4e10a
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/envoyextensions/go.mod) = 2072
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/proto-public/go.mod) = 60774c6c9bf017ed514de63c4876e3692b9dd6b4918777b03cac5ca791c51f9e
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/proto-public/go.mod) = 391
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/sdk/go.mod) = 4ff09a003397c1a244764027011fc024a29cc8b3a256160345dd4846f297a23d
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/sdk/go.mod) = 823
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/troubleshoot/go.mod) = 74283d7b743227c1ad0c832e0151601e06089053846fe10c38ba86aab7f04544
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/troubleshoot/go.mod) = 2848
-SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/hashicorp-consul-v1.20.3_GH0.tar.gz) = c9f6958f7e30e64a26cfde80c059213829517bf695a8915a8103ca26639c68ad
-SIZE (go/sysutils_consul/hashicorp-consul-v1.20.3_GH0/hashicorp-consul-v1.20.3_GH0.tar.gz) = 39210557
+TIMESTAMP = 1740408884
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/go.mod) = a5fda3280719f08a87a3c36c3338ca71f4ff7bc099db2f7fb6c63d493049d684
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/go.mod) = 13795
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/api/go.mod) = 6b91b610399ae6ee82958d130d8f7580b4616011a9007a0cad4fa55ade700179
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/api/go.mod) = 1870
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/envoyextensions/go.mod) = 16e85e8cc4b613fe9bb1287ce8c46eff7ab5ced4b8b8dff6c5f4f398e6e4e10a
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/envoyextensions/go.mod) = 2072
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/proto-public/go.mod) = 60774c6c9bf017ed514de63c4876e3692b9dd6b4918777b03cac5ca791c51f9e
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/proto-public/go.mod) = 391
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/sdk/go.mod) = 4ff09a003397c1a244764027011fc024a29cc8b3a256160345dd4846f297a23d
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/sdk/go.mod) = 823
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/troubleshoot/go.mod) = 74283d7b743227c1ad0c832e0151601e06089053846fe10c38ba86aab7f04544
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/troubleshoot/go.mod) = 2848
+SHA256 (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/hashicorp-consul-v1.20.4_GH0.tar.gz) = 33edef107baf49cebd46c532e4def81f01b01378929178927bb5d2023237f93f
+SIZE (go/sysutils_consul/hashicorp-consul-v1.20.4_GH0/hashicorp-consul-v1.20.4_GH0.tar.gz) = 39216717