--- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Tue Jul 30 09:58:18 2019 +0300
+++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacAppImageBuilder.java	Thu Aug 08 17:21:32 2019 -0400
@@ -355,6 +355,12 @@
         sign();
     }
 
+    @Override
+    File getRuntimeImageDir(File runtimeImageTop) {
+        File home = new File(runtimeImageTop, "Contents/Home");
+        return (home.exists() ? home : runtimeImageTop);
+    }
+
     private void copyRuntimeFiles() throws IOException {
         // Generate Info.plist
         writeInfoPlist(contentsDir.resolve("Info.plist").toFile());