diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile
--- a/devel/bazel/Makefile
+++ b/devel/bazel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	bazel
-DISTVERSION=	6.2.0
+DISTVERSION=	6.4.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/bazelbuild/${PORTNAME}/releases/download/${DISTVERSION}/
 DISTNAME=	bazel-${DISTVERSION}-dist
@@ -46,8 +46,9 @@
 		${FILESDIR}/extra-patch-abseil-cpp-cfe27e79cfcbefb2b4479e04f80cbb299bc46965 \
 		${WRKSRC}/third_party/py/abseil/
 	@${CP} ${FILESDIR}/extra-patch-grpc_bazel_grpc__deps.bzl \
-		${FILESDIR}/extra-patch-upb_bazel_build__defs.bzl \
 		${WRKSRC}/third_party/grpc/
+	@${CP} ${FILESDIR}/extra-patch-upb_bazel_build__defs.bzl \
+		${WRKSRC}/third_party/upb/
 
 # Have the location of the system-wide rc file reside ${ETCDIR}.
 # Also adapt the sample file to disable persistent java workers as they
diff --git a/devel/bazel/distinfo b/devel/bazel/distinfo
--- a/devel/bazel/distinfo
+++ b/devel/bazel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684957266
-SHA256 (bazel-6.2.0-dist.zip) = f1e8f788637ac574d471d619d2096baaca04a19b57a034399e079633db441945
-SIZE (bazel-6.2.0-dist.zip) = 196992916
+TIMESTAMP = 1701685940
+SHA256 (bazel-6.4.0-dist.zip) = bd88ff602c8bbb29ee82ba2a6b12ad092d51ec668c6577f9628f18e48ff4e51e
+SIZE (bazel-6.4.0-dist.zip) = 206062629
diff --git a/devel/bazel/files/extra-patch-upb_bazel_build__defs.bzl b/devel/bazel/files/extra-patch-upb_bazel_build__defs.bzl
--- a/devel/bazel/files/extra-patch-upb_bazel_build__defs.bzl
+++ b/devel/bazel/files/extra-patch-upb_bazel_build__defs.bzl
@@ -1,10 +1,10 @@
---- bazel/build_defs.bzl.orig	2022-06-21 20:39:47 UTC
-+++ bazel/build_defs.bzl
-@@ -36,6 +36,7 @@ _DEFAULT_CPPOPTS.extend([
-     # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
-     "-Werror",
-     "-Wno-long-long",
-+    "-Wno-deprecated-copy",
- ])
- _DEFAULT_COPTS.extend([
-     "-std=c99",
+--- bazel/build_defs.bzl.orig	2023-08-27 12:41:41.968319000 +0100
++++ bazel/build_defs.bzl	2023-08-27 12:40:59.707318000 +0100
+@@ -43,6 +43,7 @@
+     "-Werror=pedantic",
+     "-Wall",
+     "-Wstrict-prototypes",
++    "-Wno-gnu-offsetof-extensions",
+     # GCC (at least) emits spurious warnings for this that cannot be fixed
+     # without introducing redundant initialization (with runtime cost):
+     #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
diff --git a/devel/bazel/files/patch-distdir_deps.bzl b/devel/bazel/files/patch-distdir_deps.bzl
--- a/devel/bazel/files/patch-distdir_deps.bzl
+++ b/devel/bazel/files/patch-distdir_deps.bzl
@@ -1,4 +1,4 @@
---- distdir_deps.bzl.orig	1980-01-01 05:00:00 UTC
+--- distdir_deps.bzl.orig	1980-01-01 00:00:00 UTC
 +++ distdir_deps.bzl
 @@ -122,6 +122,7 @@ DIST_DEPS = {
          "patch_args": ["-p1"],
@@ -8,7 +8,17 @@
              "//third_party/grpc:grpc_1.47.0.win_arm64.patch",
          ],
          "used_in": [
-@@ -234,6 +235,10 @@ DIST_DEPS = {
+@@ -196,6 +197,9 @@ DIST_DEPS = {
+             "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
+             "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz",
+         ],
++        "patches": [
++            "//third_party/upb:extra-patch-upb_bazel_build__defs.bzl",
++        ],
+         "used_in": [
+             "additional_distfiles",
+             "test_WORKSPACE_files",
+@@ -234,6 +238,10 @@ DIST_DEPS = {
          "urls": [
              "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
              "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",