diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index ac4f641fb9b0..16e358bacd39 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -1,43 +1,51 @@
 PORTNAME=	nomad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.9.3
-PORTREVISION=	5
+DISTVERSION=	1.9.6
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/nomad/${DISTVERSIONFULL}/
 DISTFILES=	go.mod \
 		api/go.mod
 
+# Patches with fixes:
+# - Fix default client retry configuration
+# - Allow disabling "wait" again
+# - Fix runaway render loop in consul-template
+PATCH_SITES=	https://github.com/hashicorp/${PORTNAME}/commit/
+PATCHFILES+=	7b89c0ee28b17a742b97ecd9c6601ba7839748cb.diff:-p1 \
+		590b085246c58bb233b2c1a59b3f22a0bf2e2bd4.diff:-p1 \
+		37fb418a160a380ee20dc19ea3eaecf0bbd27e64.diff:-p1
+
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Cluster manager and scheduler
 WWW=		https://www.nomadproject.io/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe go:1.23,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RC_SUBR=	nomad
 
 GO_MODULE=	github.com/hashicorp/nomad
 GO_BUILDFLAGS=	-tags ui \
 		-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}"
 
 USERS=		nomad
 GROUPS=		nomad
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad
 	${INSTALL_DATA} ${WRKSRC}/demo/vagrant/client1.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client1.hcl.sample
 	${INSTALL_DATA} ${WRKSRC}/demo/vagrant/client2.hcl ${STAGEDIR}${PREFIX}/etc/nomad/client2.hcl.sample
 	${INSTALL_DATA} ${WRKSRC}/demo/vagrant/server.hcl ${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample
 
 # 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/nomad/distinfo b/sysutils/nomad/distinfo
index 0f16c721d0b2..0e29bbcc8b71 100644
--- a/sysutils/nomad/distinfo
+++ b/sysutils/nomad/distinfo
@@ -1,7 +1,13 @@
-TIMESTAMP = 1733521209
-SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/go.mod) = 9c01e4fed0d76f5fd11802fa72c6634922a34aaee78e20b91b458c065d0f1657
-SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/go.mod) = 15711
-SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/api/go.mod) = fbcc54abdb959be14d0e44d080a001ae030b97170f79ba4bd3bd78d277f053bf
-SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/api/go.mod) = 666
-SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/hashicorp-nomad-v1.9.3_GH0.tar.gz) = 7152af6ba624a40c0df5a9425fd47150a00e8cec79dc8716e5b10f31fdd5a9e7
-SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.3_GH0/hashicorp-nomad-v1.9.3_GH0.tar.gz) = 26414683
+TIMESTAMP = 1758923055
+SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/go.mod) = 04f704eec458c1528b396b244f2a0247e591a639b876df93e7a3c92478e2c9b5
+SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/go.mod) = 17546
+SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/api/go.mod) = fbcc54abdb959be14d0e44d080a001ae030b97170f79ba4bd3bd78d277f053bf
+SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/api/go.mod) = 666
+SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/hashicorp-nomad-v1.9.6_GH0.tar.gz) = c967a6e400a7aaebcff10a6dc063edcc5f64a0aedbc31a496ab6ab4ab3c0ea7d
+SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/hashicorp-nomad-v1.9.6_GH0.tar.gz) = 26492618
+SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/7b89c0ee28b17a742b97ecd9c6601ba7839748cb.diff) = f24ed132378e9bb4726e83bb81701697a9e041dafd49928a8e71efdf1b242a5d
+SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/7b89c0ee28b17a742b97ecd9c6601ba7839748cb.diff) = 6421
+SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/590b085246c58bb233b2c1a59b3f22a0bf2e2bd4.diff) = 3de9cc76287c762e033dd8a2591d9727230124578592afc862724ff2e68b750f
+SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/590b085246c58bb233b2c1a59b3f22a0bf2e2bd4.diff) = 2690
+SHA256 (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/37fb418a160a380ee20dc19ea3eaecf0bbd27e64.diff) = 6336fda0569a01073de5b829d4091576cec9162d61f9f09b01ce6873eb9d2015
+SIZE (go/sysutils_nomad/hashicorp-nomad-v1.9.6_GH0/37fb418a160a380ee20dc19ea3eaecf0bbd27e64.diff) = 1576
diff --git a/sysutils/nomad/files/patch-vendor__modules.txt b/sysutils/nomad/files/patch-vendor__modules.txt
new file mode 100644
index 000000000000..23b6cd340409
--- /dev/null
+++ b/sysutils/nomad/files/patch-vendor__modules.txt
@@ -0,0 +1,11 @@
+--- vendor/modules.txt.orig	2025-09-26 14:45:28.694427000 -0700
++++ vendor/modules.txt	2025-09-26 14:45:40.928402000 -0700
+@@ -763,7 +763,7 @@
+ # github.com/hashicorp/cli v1.1.6
+ ## explicit; go 1.20
+ github.com/hashicorp/cli
+-# github.com/hashicorp/consul-template v0.39.0
++# github.com/hashicorp/consul-template v0.40.0
+ ## explicit; go 1.22
+ github.com/hashicorp/consul-template/child
+ github.com/hashicorp/consul-template/config