--- old/modules/jdk.packager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	2016-10-05 08:06:53.000000000 -0700
+++ new/modules/jdk.packager/src/main/java/com/oracle/tools/packager/StandardBundlerParam.java	2016-10-05 08:06:53.000000000 -0700
@@ -156,7 +156,11 @@
                     params -> {
                         //FIXME sniff modules
                         extractMainClassInfoFromAppResources(params);
-                        return (String) params.get(BundleParams.PARAM_APPLICATION_CLASS);
+                        String s = (String) params.get(BundleParams.PARAM_APPLICATION_CLASS);
+                        if (s == null) {
+                            s = JLinkBundlerHelper.getMainClass(params);
+                        }
+                        return s;
                     },
                     (s, p) -> s
             );