diff --git a/srcpkgs/bazel/template b/srcpkgs/bazel/template
index d45cffd7e88..50cbbf87ed6 100644
--- a/srcpkgs/bazel/template
+++ b/srcpkgs/bazel/template
@@ -1,7 +1,7 @@
 # Template file for 'bazel'
 pkgname=bazel
 version=8.2.1
-revision=1
+revision=2
 hostmakedepends="protobuf python3 unzip openjdk21 which perl grpc zip tar"
 makedepends="protobuf-devel libprotoc-devel grpc-devel libarchive-devel
  zlib-devel"
@@ -65,11 +65,17 @@ do_build() {
 		--output=output/bazel.fish
 
 	cp scripts/zsh_completion/_bazel output/
+	cat >output/bazel.wrapper <<-EOF
+	#!/bin/sh
+	export JAVA_HOME="$JAVA_HOME"
+	exec /usr/libexec/bazel/bazel "\$@"
+	EOF
 	chmod -R u+rwX /tmp
 }
 
 do_install() {
-	vbin output/bazel
+	vinstall output/bazel 755 usr/libexec/bazel/
+	vbin output/bazel.wrapper bazel
 	vcompletion output/bazel-complete.bash bash
 	vcompletion output/bazel.fish fish
 	vcompletion output/_bazel zsh