diff --git a/files/java-shim.sh b/files/java-shim.sh
new file mode 100755
--- /dev/null
+++ b/files/java-shim.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$JAVA_HOME" ]; then
+    export JAVA_HOME=/usr/lib64/openjdk-8
+fi
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : kotlin-native
 version    : 1.3.72
-release    : 3
+release    : 4
 source     :
     - https://github.com/JetBrains/kotlin-native/archive/v1.3.72.tar.gz : 1f53ec1996b0f79ca615549fa5dc8485ef356cfab413212dceac64362ea6a13d
     - https://download.jetbrains.com/kotlin/native/clang-llvm-8.0.0-linux-x86-64.tar.gz : a9ebf55170bdbe5e089dbf884e0bc52065b5b7bc52e9354415e25a36e10e56c5
@@ -20,10 +20,11 @@
     Kotlin/Native is primarily designed to allow compilation for platforms where virtual machines are not desirable or possible (such as iOS, embedded targets), or where developer is willing to produce reasonably-sized self-contained program without need to ship an additional execution runtime.
 networking : true
 environment: |
+    export JAVA_HOME=/usr/lib64/openjdk-8
     # prevents Gradle, Konan, and Java from failing to create files in ~
-    export HOME=$workdir/tmphome
-    export GRADLE_USER_HOME=$HOME/gradle
-    export KONAN_DATA_DIR=$HOME/konan
+    export JAVA_OPTS="-Djava.util.prefs.userRoot=$workdir/.java"
+    export GRADLE_USER_HOME="$workdir/.gradle"
+    export KONAN_DATA_DIR="$workdir/.konan"
     # prevents Gradle from dying due to being unable to identify some terminals like Kitty
     export TERM=xterm-256color
 builddeps  :
@@ -31,10 +32,11 @@
 rundeps    :
     - openjdk-8
 setup      : |
-    mkdir -p $KONAN_DATA_DIR/cache/
+    mkdir -p $KONAN_DATA_DIR/dependencies/
     for FILE in $sources/*.tar.gz; do
         if [[ $FILE != *"%version%"* ]]; then
-            cp $FILE $KONAN_DATA_DIR/cache/
+            tar xzf $FILE -C $KONAN_DATA_DIR/dependencies/
+            echo $(basename -s .tar.gz $FILE) >> $KONAN_DATA_DIR/dependencies/.extracted
         fi
     done
 
@@ -53,5 +55,7 @@
     mkdir -p $installdir/usr/bin
     cd $installdir/usr/share/kotlin-native/bin
     for FILE in *; do
-        ln -s /usr/share/kotlin-native/bin/$FILE $installdir/usr/bin/
+        cp $pkgfiles/java-shim.sh $installdir/usr/bin/$FILE
+        echo "/usr/share/kotlin-native/bin/$FILE \"\$@\"" >> $installdir/usr/bin/$FILE
+        chmod +x $installdir/usr/bin/$FILE
     done
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3120,8 +3120,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="3">
-            <Date>2020-04-14</Date>
+        <Update release="4">
+            <Date>2020-05-02</Date>
             <Version>1.3.72</Version>
             <Comment>Packaging update</Comment>
             <Name>Campbell Jones</Name>