diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : bazel
 version    : 3.1.0
-release    : 7
+release    : 8
 source     :
     - https://github.com/bazelbuild/bazel/releases/download/3.1.0/bazel-3.1.0-dist.zip : d7f40d0cac95a06cea6cb5b7f7769085257caebc3ee84269dd9298da760d5615
 license    : Apache-2.0
@@ -8,14 +8,20 @@
 summary    : A fast, scalable, multi-language and extensible build system
 description: |
     A fast, scalable, multi-language and extensible build system
+debug      : no
 strip      : no
 builddeps  :
-    - openjdk-8
+    - openjdk-8-devel
 rundeps    :
     - openjdk-8
+environment: |
+    export JAVA_HOME=/usr/lib64/openjdk-8
 build      : |
     env EXTRA_BAZEL_ARGS="--host_javabase=@local_jdk//:jdk" bash compile.sh
-    $workdir/scripts/generate_bash_completion.sh --bazel=$workdir/output/bazel --output=$workdir/output/bazel.bash
+    $workdir/scripts/generate_bash_completion.sh \
+        --bazel=$workdir/output/bazel --output=$workdir/output/bazel.bash \
+        --prepend=$workdir/scripts/bazel-complete-header.bash \
+        --prepend=$workdir/scripts/bazel-complete-template.bash
 install    : |
     install -Dm00755 output/bazel -t $installdir/usr/share/bazel
     install -Dm00755 $pkgfiles/bazel.sh $installdir/usr/bin/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>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Longwu Ou</Name>
+            <Email>xulongwu4@gmail.com</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>programming.tools</PartOf>
@@ -26,12 +26,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="7">
-            <Date>2020-04-28</Date>
+        <Update release="8">
+            <Date>2020-05-21</Date>
             <Version>3.1.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Longwu Ou</Name>
+            <Email>xulongwu4@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file