diff --git a/files/cryptomator.sh b/files/cryptomator.sh
deleted file mode 100644
--- a/files/cryptomator.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/lib64/openjdk-8/bin/java -jar /usr/share/cryptomator/cryptomator.jar "$@"
diff --git a/files/java-shim.txt b/files/java-shim.txt
new file mode 100755
--- /dev/null
+++ b/files/java-shim.txt
@@ -0,0 +1,5 @@
+if [ -z "$JAVA_HOME" ]; then
+    export JAVA_HOME=/usr/lib64/openjdk-11
+fi
+
+exec $JAVA_HOME/bin/
\ No newline at end of file
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : cryptomator
-version    : 1.3.5
-release    : 2
+version    : 1.5.0
+release    : 3
 source     :
-    - https://github.com/cryptomator/cryptomator/archive/1.3.5.tar.gz : 6123104bf4dc9d711d2e57098a2cb691a556ec85b439ac0363b82092acaedf01
+    - https://github.com/cryptomator/cryptomator/archive/1.5.0.tar.gz : fa0e9b9c71f8fbfef070b7b0604feebf94c1b6e439eae6f2d2bf7bb7ff58f7f3
 license    : MIT
 component  : security.crypto
 summary    : Client-side encryption of your files in the cloud
@@ -11,15 +11,23 @@
 networking : yes
 builddeps  :
     - apache-maven
-    - openjfx-8
 rundeps    :
-    - openjfx-8
+    - openjdk-11
 build      : |
-    export MAVEN_OPTS='-Dmaven.repo.local=.m2'
+    export MAVEN_OPTS="-Dmaven.repo.local=.m2"
+    export JAVA_HOME=/usr/lib64/openjdk-11
     cd main
     mvn -Prelease package
 install    : |
-    install -Dm00644 main/uber-jar/target/Cryptomator-*.jar $installdir/usr/share/cryptomator/cryptomator.jar
-    install -Dm00755 $pkgfiles/cryptomator.sh $installdir/usr/bin/cryptomator
-    install -Dm00644 main/ant-kit/src/main/resources/package/linux/Cryptomator.png $installdir/usr/share/pixmaps/cryptomator.png
+    install -dm00644 $installdir/usr/share/cryptomator/libs/
+    install -dm00755 $installdir/usr/bin/
+
+    install -Dm00644 main/buildkit/target/libs/* main/buildkit/target/linux-libs/* $installdir/usr/share/cryptomator/libs/
+    install -Dm00755 main/buildkit/target/launcher-linux.sh $installdir/usr/share/cryptomator/cryptomator
+    ln -s /usr/share/cryptomator/cryptomator $installdir/usr/bin/cryptomator
+
+    install -Dm00644 cryptomator.png $installdir/usr/share/pixmaps/cryptomator.png
     install -Dm00644 $pkgfiles/cryptomator.desktop $installdir/usr/share/applications/cryptomator.desktop
+
+    sed -i "1r $pkgfiles/java-shim.txt" $installdir/usr/share/cryptomator/cryptomator
+    sed -i "s/libs/\/usr\/share\/cryptomator\/libs/" $installdir/usr/share/cryptomator/cryptomator
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>cryptomator</Name>
         <Packager>
-            <Name>Fabio Forni</Name>
-            <Email>livingsilver94.solus@redaril.me</Email>
+            <Name>Campbell Jones</Name>
+            <Email>dev@serebit.com</Email>
         </Packager>
         <License>MIT</License>
         <PartOf>security.crypto</PartOf>
@@ -21,17 +21,89 @@
         <Files>
             <Path fileType="executable">/usr/bin/cryptomator</Path>
             <Path fileType="data">/usr/share/applications/cryptomator.desktop</Path>
-            <Path fileType="data">/usr/share/cryptomator/cryptomator.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/cryptomator</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/asm-7.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/asm-analysis-7.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/asm-commons-7.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/asm-tree-7.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/asm-util-7.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/checker-qual-2.10.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/commons-1.5.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/commons-cli-1.4.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/commons-codec-1.14.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/commons-io-2.6.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/commons-lang3-3.9.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/cryptofs-1.9.5.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/cryptolib-1.3.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/dagger-2.27.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/dbus-java-3.0.2.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/dokany-nio-adapter-1.1.13.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/easybind-1.0.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/error_prone_annotations-2.3.4.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/failureaccess-1.0.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/fuse-nio-adapter-1.2.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/gson-2.8.6.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/guava-28.2-jre.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/hkdf-1.0.2.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/j2objc-annotations-1.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jackrabbit-webdav-2.19.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jackson-annotations-2.10.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jackson-core-2.10.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jackson-databind-2.10.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/java-jwt-3.10.2.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/java-utils-1.0.5.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-base-14-linux.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-base-14.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-controls-14-linux.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-controls-14.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-fxml-14-linux.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-fxml-14.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-graphics-14-linux.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javafx-graphics-14.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javax.inject-1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/javax.servlet-api-3.1.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-http-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-io-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-security-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-server-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-servlet-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-util-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-webapp-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jetty-xml-9.4.17.v20190418.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jffi-1.2.23-native.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jffi-1.2.23.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jna-5.1.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jna-platform-5.1.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jni-2.2.2.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jnr-a64asm-1.0.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jnr-constants-0.9.15.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jnr-ffi-2.1.12.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jnr-fuse-0.5.4.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jnr-posix-3.0.54.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jnr-x86asm-1.0.2.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/jsr305-3.0.2.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/keychain-1.5.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/launcher-1.5.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/logback-classic-1.2.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/logback-core-1.2.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/secret-service-1.0.0-RC.3.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/siv-mode-1.3.1.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/slf4j-api-1.7.30.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/ui-1.5.0.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/webdav-nio-adapter-1.0.10.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/webdav-nio-adapter-servlet-1.0.6.jar</Path>
+            <Path fileType="data">/usr/share/cryptomator/libs/zxcvbn-1.3.0.jar</Path>
             <Path fileType="data">/usr/share/pixmaps/cryptomator.png</Path>
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2020-05-05</Date>
-            <Version>1.3.5</Version>
+        <Update release="3">
+            <Date>2020-06-20</Date>
+            <Version>1.5.0</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