diff --git a/security/vault/Makefile b/security/vault/Makefile
index 312a47adb6c4..310c4f101bad 100644
--- a/security/vault/Makefile
+++ b/security/vault/Makefile
@@ -1,73 +1,72 @@
 PORTNAME=	vault
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.18.3
-PORTREVISION=	1
+DISTVERSION=	1.18.4
 CATEGORIES=	security
 MASTER_SITES=	https://raw.githubusercontent.com/hashicorp/vault/${DISTVERSIONFULL}/ \
 		LOCAL/bofh/security/${PORTNAME}/:web_ui
 DISTFILES=	go.mod \
 		api/go.mod \
 		api/auth/approle/go.mod \
 		api/auth/kubernetes/go.mod \
 		api/auth/userpass/go.mod \
 		sdk/go.mod \
 		${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX}:web_ui
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for securely accessing secrets
 WWW=		https://vaultproject.io/
 
 NOT_FOR_ARCHS=	armv7 i386
 NOT_FOR_ARCHS_REASON=	fatal error: out of memory
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 .if defined(MAINTAINER_MODE)
 EXTRACT_DEPENDS=npm-node20>0:www/npm-node20 \
 		yarn-node20>0:www/yarn-node20
 .endif
 
 USES=		cpe go:1.23,modules
 CPE_VENDOR=	hashicorp
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 USE_RC_SUBR=	vault
 
 GO_MODULE=	github.com/hashicorp/vault
 GO_BUILDFLAGS=	-ldflags="-s \
 		-X github.com/hashicorp/vault/version.GitCommit=${GITID} \
 		-X github.com/hashicorp/vault/version.BuildDate=${SOURCE_DATE_EPOCH:U${SOURCE_DATE_EPOCH_CMD:sh}} \
 		" -tags "vault ui"
 
 SUB_FILES=	pkg-message
 
 USERS=		vault
 GROUPS=		vault
 
 PLIST_FILES=	bin/${PORTNAME}
 
-GITID=	7ae4eca5403bf574f142cd8f987b8d83bafcd1de
+GITID=	503be623a3697e8c10c254dc87d26492c46753e1
 
 .include <bsd.port.pre.mk>
 
 # Bring DISTINFO_FILE into scope so we can get the timestamp.
 SOURCE_DATE_EPOCH_CMD=	date -ur \
 			$$(${GREP} -m1 TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') \
 			'+%Y-%m-%dT%H:%M:%SZ'
 
 post-patch:
 	${CP} -Rf ${WRKDIR}/web_ui ${WRKSRC}/http/
 
 .if defined(MAINTAINER_MODE)
 _make-web_ui: extract
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} npm rebuild node-sass
 	cd ${WRKSRC}/ui && ${SETENV} ${MAKE_ENV} yarn run build
 	cd ${WRKDIR} && ${TAR} -czf \
 		${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/http web_ui
 	scp ${WRKDIR}/${PORTNAME}-web_ui-${DISTVERSION}${EXTRACT_SUFX} \
 		bofh@freefall.freebsd.org:public_distfiles/security/${PORTNAME}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/vault/distinfo b/security/vault/distinfo
index 00163a7b523c..5b5514ccbedc 100644
--- a/security/vault/distinfo
+++ b/security/vault/distinfo
@@ -1,17 +1,17 @@
-TIMESTAMP = 1734679288
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/go.mod) = 6dac2b1b9eccc113a5e5c80b31ea8bcbd618fee5df18ab42ca7764fbffb5d976
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/go.mod) = 29153
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/go.mod) = 5cd193699e4dce7cad226266283528eaa14840ccd108135e07c7c3d77cef36b8
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/go.mod) = 1675
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/auth/approle/go.mod) = 756cd9d672c69600a2aa98c3b2eca41a99ccf136fab256ffe670157bbcaabd92
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/auth/approle/go.mod) = 1082
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/auth/kubernetes/go.mod) = b998f8a687a1cbf13cc826f686cb913ef190ab41b313bdb2f2fe072152d39caf
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/auth/kubernetes/go.mod) = 1085
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/auth/userpass/go.mod) = 01212237d291141371ddfd5a619e00eb14ca48375f364cc4441a0d56ae2f41b3
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/api/auth/userpass/go.mod) = 1083
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/sdk/go.mod) = 66142c89bbaa7ad37a3dffaa03add5c90159c0af138c5c73fe1a4970f9fbd56e
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/sdk/go.mod) = 6151
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/vault-web_ui-1.18.3.tar.gz) = 18c8cc8ad49ea3c8998369498fb86665153a5b4d3a099e9cca4e24a3806af389
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/vault-web_ui-1.18.3.tar.gz) = 3029282
-SHA256 (go/security_vault/hashicorp-vault-v1.18.3_GH0/hashicorp-vault-v1.18.3_GH0.tar.gz) = d3712fcc4d202cabd9fe4c07559f19038659537c61e024c6cad0b744a142d3a4
-SIZE (go/security_vault/hashicorp-vault-v1.18.3_GH0/hashicorp-vault-v1.18.3_GH0.tar.gz) = 35908756
+TIMESTAMP = 1738703199
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/go.mod) = cf21ffd22e60ba0559d0541ff35e868c8a7defa9c3d2b7b4ac2b58e53d4c4885
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/go.mod) = 29555
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/go.mod) = 59b8e0b6eb6b01f2d3734af9fe20dfed14957404ba4efb1fab188b9eb5614803
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/go.mod) = 1675
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/auth/approle/go.mod) = cbc77e49f2e721ad0eabf1248b3ca964af0c2279c0b35596e35124f0e2f56f1b
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/auth/approle/go.mod) = 1082
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/auth/kubernetes/go.mod) = e06e219500af237c3b52fe89f247bce05dfa5b44e700a0150bd83a293cd4b40e
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/auth/kubernetes/go.mod) = 1085
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/auth/userpass/go.mod) = b1317e0a75dacc6c409549ae69f5b0c5ffc58ecd8ee776502fc369189b7d8440
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/api/auth/userpass/go.mod) = 1083
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/sdk/go.mod) = 77d6cea97679372a8a58b7bf9ddf95d908df2367f22e6e1b7c9dcf65fc42e533
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/sdk/go.mod) = 6357
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/vault-web_ui-1.18.4.tar.gz) = 0b45dbb45eda80defcece408ebd5643fa5b414312144fa8c20bc35648b59cf88
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/vault-web_ui-1.18.4.tar.gz) = 3030382
+SHA256 (go/security_vault/hashicorp-vault-v1.18.4_GH0/hashicorp-vault-v1.18.4_GH0.tar.gz) = ebaa5008d43a00e936e8c24454598fa571acb5a8fbd8024a17d8cf82584660d7
+SIZE (go/security_vault/hashicorp-vault-v1.18.4_GH0/hashicorp-vault-v1.18.4_GH0.tar.gz) = 36375887