diff --git a/files/bazel.sh b/files/bazel.sh
new file mode 100644
--- /dev/null
+++ b/files/bazel.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+JAVA_HOME=/usr/lib64/openjdk-8 exec /usr/share/bazel/bazel "$@"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,25 +1,24 @@
 name       : bazel
-version    : 2.2.0
-release    : 6
+version    : 3.1.0
+release    : 7
 source     :
-    - https://github.com/bazelbuild/bazel/releases/download/2.2.0/bazel-2.2.0-dist.zip : 9379878a834d105a47a87d3d7b981852dd9f64bc16620eacd564b48533e169a7
+    - https://github.com/bazelbuild/bazel/releases/download/3.1.0/bazel-3.1.0-dist.zip : d7f40d0cac95a06cea6cb5b7f7769085257caebc3ee84269dd9298da760d5615
 license    : Apache-2.0
 component  : programming.tools
 summary    : A fast, scalable, multi-language and extensible build system
 description: |
     A fast, scalable, multi-language and extensible build system
-debug      : no
 strip      : no
-networking : yes
 builddeps  :
     - openjdk-8
 rundeps    :
     - openjdk-8
 build      : |
     env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" bash compile.sh
-    output/bazel build //scripts:bazel-complete.bash
-    output/bazel shutdown
+    $workdir/scripts/generate_bash_completion.sh --bazel=$workdir/output/bazel --output=$workdir/output/bazel.bash
 install    : |
-    install -Dm00755 output/bazel $installdir/usr/bin/bazel
-    install -Dm00644 $workdir/bazel-bin/scripts/bazel-complete.bash $installdir/usr/share/bash-completion/completions/bazel
+    install -Dm00755 output/bazel -t $installdir/usr/share/bazel
+    install -Dm00755 $pkgfiles/bazel.sh $installdir/usr/bin/bazel
+
+    install -Dm00644 output/bazel.bash $installdir/usr/share/bash-completion/completions/bazel
     install -Dm00644 $workdir/scripts/zsh_completion/_bazel $installdir/usr/share/zsh/site-functions/_bazel
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>bazel</Name>
         <Packager>
-            <Name>Longwu Ou</Name>
-            <Email>xulongwu4@gmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>programming.tools</PartOf>
@@ -21,16 +21,17 @@
         <Files>
             <Path fileType="executable">/usr/bin/bazel</Path>
             <Path fileType="data">/usr/share/bash-completion/completions/bazel</Path>
+            <Path fileType="data">/usr/share/bazel/bazel</Path>
             <Path fileType="data">/usr/share/zsh/site-functions/_bazel</Path>
         </Files>
     </Package>
     <History>
-        <Update release="6">
-            <Date>2020-04-09</Date>
-            <Version>2.2.0</Version>
+        <Update release="7">
+            <Date>2020-04-28</Date>
+            <Version>3.1.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Longwu Ou</Name>
-            <Email>xulongwu4@gmail.com</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file