diff --git a/files/gradle b/files/gradle
new file mode 100644
--- /dev/null
+++ b/files/gradle
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -z "$JAVA_HOME" ]; then
+    JAVA_HOME=/usr/share/openjdk-8
+fi
+
+/usr/share/gradle/bin/gradle "$@"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : gradle
 version    : '4.9'
-release    : 9
+release    : 10
 source     :
     - https://github.com/gradle/gradle/archive/v4.9.0.tar.gz : 773b014b64c1ee6992e94a9be5c8c66bc13b0d3c2eb47dcf11d00a1bf5d4a1a7
     - https://github.com/gradle/gradle-completion/archive/v1.4.1.tar.gz : 5d77f0c739fe983cfa86078a615f43be9be0e3ce05a3a7b70cb813a1ebd1ceef
@@ -8,31 +8,28 @@
 component  : programming.java
 summary    : A powerful build system for the JVM
 description: |
-    Gradle is a build tool with a focus on build automation and support for multi-language development
+    Gradle is a build tool with a focus on build automation and support for multi-language development.
 networking : yes
 builddeps  :
     - openjdk-8
-    - git
 rundeps    :
     - openjdk-8
 environment: |
-    export GRADLE_COMPLETION_VERSION="1.4.1"
+    export M2_HOME=$workdir/.m2
+setup      : |
+    export GRADLE_COMPLETION_VERSION=1.4.1
 
-    export HOME=$PWD/.home
-    export JAVA_HOME=/usr/lib64/openjdk-8
-    export GRADLE_USER_HOME=$HOME/.gradle
-    export M2_HOME=$HOME/.m2
+    mkdir -p $M2_HOME/conf
+    echo "<settings><localRepository>$M2_HOME/</localRepository></settings>" > $M2_HOME/conf/settings.xml
+    tar xf $sources/v$GRADLE_COMPLETION_VERSION.tar.gz
 build      : |
-    mkdir -p $HOME/.m2/conf
-    echo "<settings>\n\t<localRepository>${HOME}/.m2/</localRepository>\n</settings>" > $HOME/.m2/conf/settings.xml
-
-    # prep gradle-completion files
-    mkdir -p .gradle-completion
-    tar xzf $sources/v$GRADLE_COMPLETION_VERSION.tar.gz --strip-components=1 -C .gradle-completion
-
+    export GRADLE_USER_HOME=$workdir/.gradle
     ./gradlew --no-daemon install -PfinalRelease=1 -Pgradle_installPath=$installdir/usr/share/gradle
 install    : |
-    mkdir -p $installdir/usr/bin
-    install -d $installdir/usr/bin
-    ln -s /usr/share/gradle/bin/gradle $installdir/usr/bin/gradle
-    install -Dm00644 .gradle-completion/gradle-completion.bash $installdir/usr/share/bash-completion/completions/gradle-completion.bash
+    install -Dm00755 $pkgfiles/gradle -t $installdir/usr/bin
+    rm $installdir/usr/share/gradle/{LICENSE,NOTICE}
+    rm $installdir/usr/share/gradle/bin/*.bat
+    rm -rf $installdir/usr/share/gradle/init.d
+
+    install -Dm00644 gradle-completion*/gradle-completion.bash -t $installdir/usr/share/bash-completion/completions
+    install -Dm00644 gradle-completion*/_gradle -t $installdir/usr/share/zsh/site-functions
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,30 +2,26 @@
     <Source>
         <Name>gradle</Name>
         <Packager>
-            <Name>F. von Gellhorn</Name>
-            <Email>flinux@vongellhorn.ch</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Packager>
         <License>Apache-2.0</License>
         <PartOf>programming.java</PartOf>
         <Summary xml:lang="en">A powerful build system for the JVM</Summary>
-        <Description xml:lang="en">Gradle is a build tool with a focus on build automation and support for multi-language development
+        <Description xml:lang="en">Gradle is a build tool with a focus on build automation and support for multi-language development.
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>gradle</Name>
         <Summary xml:lang="en">A powerful build system for the JVM</Summary>
-        <Description xml:lang="en">Gradle is a build tool with a focus on build automation and support for multi-language development
+        <Description xml:lang="en">Gradle is a build tool with a focus on build automation and support for multi-language development.
 </Description>
         <PartOf>programming.java</PartOf>
         <Files>
             <Path fileType="executable">/usr/bin/gradle</Path>
             <Path fileType="data">/usr/share/bash-completion/completions/gradle-completion.bash</Path>
-            <Path fileType="data">/usr/share/gradle/LICENSE</Path>
-            <Path fileType="data">/usr/share/gradle/NOTICE</Path>
             <Path fileType="data">/usr/share/gradle/bin/gradle</Path>
-            <Path fileType="data">/usr/share/gradle/bin/gradle.bat</Path>
-            <Path fileType="data">/usr/share/gradle/init.d/readme.txt</Path>
             <Path fileType="data">/usr/share/gradle/lib/annotations-13.0.jar</Path>
             <Path fileType="data">/usr/share/gradle/lib/ant-1.9.11.jar</Path>
             <Path fileType="data">/usr/share/gradle/lib/ant-launcher-1.9.11.jar</Path>
@@ -229,15 +225,16 @@
             <Path fileType="data">/usr/share/gradle/media/gradle-icon-512x512.png</Path>
             <Path fileType="data">/usr/share/gradle/media/gradle-icon-64x64.png</Path>
             <Path fileType="data">/usr/share/gradle/media/gradle.icns</Path>
+            <Path fileType="data">/usr/share/zsh/site-functions/_gradle</Path>
         </Files>
     </Package>
     <History>
-        <Update release="9">
-            <Date>2020-04-02</Date>
+        <Update release="10">
+            <Date>2020-04-15</Date>
             <Version>4.9</Version>
             <Comment>Packaging update</Comment>
-            <Name>F. von Gellhorn</Name>
-            <Email>flinux@vongellhorn.ch</Email>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file