diff --git a/resources/install/build.xml b/resources/install/build.xml
index 2992466b0..754218210 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -1291,6 +1291,13 @@
       </array>
       <key>CFBundleName</key>]]></replacevalue>
       </replace>
+
+      <!-- Rename Java dict to Javax to prevent OSX asking for the old Apple JVM -->
+        <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
+          <replacetoken><![CDATA[<key>Java</key>]]></replacetoken>
+          <replacevalue><![CDATA[<key>Javax</key>]]></replacevalue>
+      </replace>
+
       <!-- Add property for high resolution displays -->
       <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
         <replacetoken><![CDATA[<key>CFBundleName</key>]]></replacetoken>
diff --git a/resources/install/macosx/JavaApplicationStub b/resources/install/macosx/JavaApplicationStub
index afa07c360..08b08b1da 100755
Binary files a/resources/install/macosx/JavaApplicationStub and b/resources/install/macosx/JavaApplicationStub differ
diff --git a/src/native/macosx/launcher/launcher.m b/src/native/macosx/launcher/launcher.m
index f090f4473..6cc7dbcfc 100644
--- a/src/native/macosx/launcher/launcher.m
+++ b/src/native/macosx/launcher/launcher.m
@@ -9,7 +9,8 @@
 #import <Cocoa/Cocoa.h>
 #include <dlfcn.h>
 
-#define JVM_JAVA_KEY "Java"
+#define JVM_JAVA_KEY "Javax" // Cannot be Java
+                             // or OSX requests the old Apple JVM
 #define JVM_WORKING_DIR_KEY "WorkingDirectory"
 #define JVM_MAIN_CLASS_NAME_KEY "MainClass"
 #define JVM_CLASSPATH_KEY "ClassPath"