diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index 68c97450ee4b..b32c4e684449 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -1,22 +1,46 @@
 PORTNAME=	terraform
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.5
-PORTREVISION=	4
+DISTVERSION=	1.9.7
 CATEGORIES=	sysutils
+MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
+DISTFILES=	${DISTVERSIONFULL}${EXTRACT_SUFX} \
+		go.mod:gomod \
+		internal/backend/remote-state/azure/go.mod:gomod \
+		internal/backend/remote-state/consul/go.mod:gomod \
+		internal/backend/remote-state/cos/go.mod:gomod \
+		internal/backend/remote-state/gcs/go.mod:gomod \
+		internal/backend/remote-state/kubernetes/go.mod:gomod \
+		internal/backend/remote-state/oss/go.mod:gomod \
+		internal/backend/remote-state/pg/go.mod:gomod \
+		internal/backend/remote-state/s3/go.mod:gomod \
+		internal/legacy/go.mod:gomod
+EXTRACT_ONLY=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Ngo.work}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dutra@FreeBSD.org
 COMMENT=	Provides a common configuration to launch infrastructure
 WWW=		https://terraform.io/
 
 USES=		cpe go:1.22,modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	hashicorp
+GH_PROJECT=	terraform
 
 LICENSE_NAME=	Business Source License 1.1
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror pkg-sell auto-accept
 
 CPE_VENDOR=	hashicorp
 GO_MODULE=	github.com/hashicorp/terraform
 
+# Disable some master port targets
+TARGET_ORDER_OVERRIDE=	-1:go-post-extract
+
+post-extract:
+	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
+	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy)
+	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
+	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor)
+
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/terraform/distinfo b/sysutils/terraform/distinfo
index 776ddb84405c..09b24c9c8ed0 100644
--- a/sysutils/terraform/distinfo
+++ b/sysutils/terraform/distinfo
@@ -1,5 +1,25 @@
-TIMESTAMP = 1717864745
-SHA256 (go/sysutils_terraform/terraform-v1.8.5/v1.8.5.mod) = b5c29e0b547ce094632723d389f2df5f1d837206c70d0b41e43db5c8548ab519
-SIZE (go/sysutils_terraform/terraform-v1.8.5/v1.8.5.mod) = 14016
-SHA256 (go/sysutils_terraform/terraform-v1.8.5/v1.8.5.zip) = 36ba6a9922e05ad347695bab845d51ca29a0ea404c5d0637960d4594dfcb057f
-SIZE (go/sysutils_terraform/terraform-v1.8.5/v1.8.5.zip) = 8519160
+TIMESTAMP = 1732149851
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/v1.9.7.tar.gz) = 3409674469938669ba0cda3b437a54cbe3e47b3a2a66c226311afa05e15389a4
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/v1.9.7.tar.gz) = 6572205
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/go.mod) = 09a05ada28068ab5d99b199aca3f8f458a3cfc5bc8fd4231293d7d689ff878f1
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/go.mod) = 17144
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/azure/go.mod) = 6de81e6fbf3afae0fd2ebfdad3fd170bd0322ebbca21c3a4eb559b46ab765bec
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/azure/go.mod) = 3826
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/consul/go.mod) = 2136d1f276d86823b0bf27e64ec5c1ad62fbae89d5c372a5615af35b7dc58f92
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/consul/go.mod) = 3124
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/cos/go.mod) = cc2bdbb2ce73324a161c8273fc90b016d286248483b042478834dfd5b7d02fbb
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/cos/go.mod) = 2720
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/gcs/go.mod) = 2fc9446bf6fb10a0f72d0c77ea5463df3fb68a38ccec1d2ca4bd945667687476
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/gcs/go.mod) = 3371
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/kubernetes/go.mod) = 48c4515fa2803a6662fd0bd0f8141c2e3271107efbfaafa0a4218e89e983e1f6
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/kubernetes/go.mod) = 4754
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/oss/go.mod) = cfce62aff3bf2e206d60a27b2e1107e5282d2dfb496132bea8dcc478ba42f1a7
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/oss/go.mod) = 3160
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/pg/go.mod) = 44e66c030d6993ec512c42e0b893f1ab9841348145212f47d2fbc0701cbe0ef9
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/pg/go.mod) = 2308
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/s3/go.mod) = 3aa7a5261f64ada1cf8d4836057b5cc1de331989075b527399f26c73b10361a7
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/backend/remote-state/s3/go.mod) = 4350
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/legacy/go.mod) = 46479835c0dcd94447cdc4af6cf7071affaa32b4fdd704bf7bfa89d54a835857
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/internal/legacy/go.mod) = 1172
+SHA256 (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/hashicorp-terraform-v1.9.7_GH0.tar.gz) = 3409674469938669ba0cda3b437a54cbe3e47b3a2a66c226311afa05e15389a4
+SIZE (go/sysutils_terraform/hashicorp-terraform-v1.9.7_GH0/hashicorp-terraform-v1.9.7_GH0.tar.gz) = 6572205