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-11
+fi
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : scala
 version    : 2.13.2
-release    : 5
+release    : 6
 source     :
     - https://github.com/scala/scala/archive/v2.13.2.tar.gz : 54fc3ef0c86534aafe7be9fb52daad18e82bbd920c4b90585c4f4f33cbb9274f
 license    : BSD-3-Clause
@@ -10,18 +10,17 @@
     Scala Language Toolchain
 builddeps  :
     - git
-    - openjdk-8-devel
+    - openjdk-11-devel
     - sbt
 rundeps    :
-    - openjdk-8
+    - openjdk-11
 networking : yes
 build      : |
-    # Unfortunately we need to build the whole doc to get manpages.
     sbt -Divy.home=$workdir/.ivy2 \
         -Dsbt.global.base=$workdir/.sbt \
         -Dsbt.ivy.home=$workdir/.ivy2 \
         -Duser.home=$workdir/.java \
-        enableOptimizer package doc
+        enableOptimizer package dist/mkPack
 install    : |
     cd build
 
@@ -31,12 +30,10 @@
     pushd pack/bin
     rm *.bat
     install -dm00755 $installdir/usr/bin
-    for cmd in *; do
-        # Set JAVACMD at line 2 of every command (i.e. after shabang)
-        sed '2iJAVACMD=/usr/lib64/openjdk-8/bin/java' -i $cmd
-
-        install -Dm00755 $cmd -t $installdir/usr/share/scala/bin
-        ln -s /usr/share/scala/bin/$cmd $installdir/usr/bin/$cmd
+    for FILE in *; do
+        install -Dm00755 $FILE -t $installdir/usr/share/scala/bin
+        cp $pkgfiles/java-shim.sh $installdir/usr/bin/$FILE
+        echo "/usr/share/scala/bin/$FILE \"\$@\"" >> $installdir/usr/bin/$FILE
     done
     popd
 
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>scala</Name>
         <Packager>
-            <Name>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Packager>
         <License>BSD-3-Clause</License>
         <PartOf>programming</PartOf>
@@ -34,6 +34,8 @@
             <Path fileType="data">/usr/share/scala/bin/scalac</Path>
             <Path fileType="data">/usr/share/scala/bin/scaladoc</Path>
             <Path fileType="data">/usr/share/scala/bin/scalap</Path>
+            <Path fileType="data">/usr/share/scala/lib/jline.jar</Path>
+            <Path fileType="data">/usr/share/scala/lib/jna.jar</Path>
             <Path fileType="data">/usr/share/scala/lib/repl.jar</Path>
             <Path fileType="data">/usr/share/scala/lib/scala-compiler-doc.jar</Path>
             <Path fileType="data">/usr/share/scala/lib/scala-compiler-interactive.jar</Path>
@@ -47,12 +49,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="5">
-            <Date>2020-04-25</Date>
+        <Update release="6">
+            <Date>2020-06-05</Date>
             <Version>2.13.2</Version>
             <Comment>Packaging update</Comment>
-            <Name>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file