diff --git a/build/build.xml b/build/build.xml
index a6b480f8ff0..bcc99dc2a9b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -105,6 +105,7 @@
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino17" />
   <property name="AVRCORE-VERSION" value="1.8.2" />
   <property name="arduinoOTA-VERSION" value="1.3.0" />
+  <property name="MACOSX-APPBUNDLER-VERSION" value="1.0.1-arduino" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -387,13 +388,13 @@
     <mkdir dir="${staging_folder}/work" />
 
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino5.jar.zip" />
-      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
-      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino5" />
+      <param name="archive_file" value="${staging_folder}/appbundler-${MACOSX-APPBUNDLER-VERSION}.jar.zip" />
+      <param name="archive_url" value="https://downloads.arduino.cc/appbundler-${MACOSX-APPBUNDLER-VERSION}.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-${MACOSX-APPBUNDLER-VERSION}" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-${MACOSX-APPBUNDLER-VERSION}" />
     </antcall>
 
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino5/appbundler-1.0ea-arduino5.jar"/>
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-${MACOSX-APPBUNDLER-VERSION}/appbundler-${MACOSX-APPBUNDLER-VERSION}.jar"/>
 
     <bundleapp
             jvmRequired="1.8"
diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index f70c65082bf..cac08da13d4 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -15,12 +15,18 @@ export CLASSPATH
 LD_LIBRARY_PATH=$APPDIR/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
-export PATH="${APPDIR}/java/bin:${PATH}"
-
 export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
 
 JAVA=java
-if [ -x "$APPDIR/java/bin/java" ]; then
+
+#check systemwide java version, prefer Oracle jre
+if [ -x "$(command -v java)" ]; then
+	SYSTEM_OPENJDK=`java -version 2>&1 | grep openjdk`
+fi
+
+if [[ -x "$APPDIR/java/bin/java" && x$SYSTEM_OPENJDK != "x" ]]; then
+  echo "Using bundled Java JRE"
+  export PATH="${APPDIR}/java/bin:${PATH}"
   JAVA=$APPDIR/java/bin/java
 fi
 
diff --git a/build/macosx/appbundler-1.0.1-arduino.jar.zip.sha b/build/macosx/appbundler-1.0.1-arduino.jar.zip.sha
new file mode 100644
index 00000000000..aace4f95ca6
--- /dev/null
+++ b/build/macosx/appbundler-1.0.1-arduino.jar.zip.sha
@@ -0,0 +1 @@
+5a1f9511b6b25a0ea13c94fc71964491dfe82b12
diff --git a/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha
deleted file mode 100644
index 3dc241c5774..00000000000
--- a/build/macosx/appbundler-1.0ea-arduino5.jar.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-d7734ca84b802d2b65137b9fc0ee01c5f2108ff0
diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index affef023c77..1326d34d73b 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -60,6 +60,7 @@
   <jre>
     <path>java</path>
     <runtimeBits>32</runtimeBits>
+    <bundledJreAsFallback>true</bundledJreAsFallback>
     <opt>-splash:"%EXEDIR%/lib/splash.png"</opt>
     <opt>-Dsun.java2d.d3d=false</opt>
     <opt>-Djna.nosys=true</opt>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 59d5a35ae0a..baca324f433 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -60,6 +60,7 @@
   <jre>
     <path>java</path>
     <runtimeBits>32</runtimeBits>
+    <bundledJreAsFallback>true</bundledJreAsFallback>
     <opt>-Dsun.java2d.d3d=false</opt>
     <opt>-Djna.nosys=true</opt>
     <opt>-Djna.nounpack=true</opt>