diff --git a/PKGBUILD b/PKGBUILD
index 96631f6..3016736 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,8 @@ pkgdesc="Arduino prototyping platform SDK"
 arch=('x86_64')
 url="https://github.com/arduino/Arduino"
 license=('GPL' 'LGPL')
-depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'arduino-builder')
-makedepends=('java-environment=8' 'apache-ant' 'unzip')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime>=8' 'arduino-builder')
+makedepends=('java-environment>=8' 'apache-ant' 'unzip')
 optdepends=('arduino-docs: Offline documentation for arduino'
             'arduino-avr-core: AVR core with upstream avr-gcc and avrdude'
             'python2: Intel Galileo Board installation')
@@ -40,14 +40,14 @@ sha512sums=('74ac124ea569823b9d8cd5a485d458e5fdac115407a5c7d1a33b8e495c5459c2acf
             'SKIP'
             '80f27ef196a205dc512f0aebb426765f2536a00059a633929bbdcfea81d7fb9fec31b27322c534a3e5953240a2906e89914562b0be0649053206a1941f659b58'
             'SKIP'
-            'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a')
+            'd10fae26d9f7c162c8c46e15c2d8d98a222a05c69463e2646e8e12f5b32e8c2673d4684ea01adc81d5da9c7f4edab2e4f83b77214b6fe24b232a1590f62ced2f')
 validpgpkeys=('326567C1C6B288DF32CB061A95FA6F43E21188C4') # Arduino Packages <support@arduino.cc>
 
 build() {
     cd "Arduino-master-${pkgver}/build"
 
     # Compile with java8
-    export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH"
+    export PATH=/usr/lib/jvm/default/bin/:"$PATH"
 
     # Do not include their avr-core + tools and no docs. We build them seperately
     ant clean dist -Dversion="${pkgver}" build -Dlight_bundle=true \
diff --git a/arduino.sh b/arduino.sh
index e0f12fe..cde41c8 100644
--- a/arduino.sh
+++ b/arduino.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH"
+export PATH=/usr/lib/jvm/default-runtime/bin/:"$PATH"
 exec /usr/share/arduino/arduino "$@"