--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java	Wed Feb 03 20:45:44 2016 +0530
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/JImageTask.java	Thu Feb 04 12:24:26 2016 +0530
@@ -65,9 +65,6 @@
         new Option<JImageTask>(false, (task, opt, arg) -> {
             task.options.help = true;
         }, "--help"),
-        new Option<JImageTask>(false, (task, opt, arg) -> {
-            task.options.xhelp = true;
-        }, "--xhelp"),
         new Option<JImageTask>(true, (task, opt, arg) -> {
             task.options.flags = arg;
         }, "--flags"),
@@ -88,7 +85,6 @@
         String directory = ".";
         boolean fullVersion;
         boolean help;
-        boolean xhelp;
         String flags;
         boolean verbose;
         boolean version;
@@ -168,9 +164,6 @@
             if (options.help) {
                 optionsHelper.showHelp(PROGNAME);
             }
-            if (options.xhelp) {
-                optionsHelper.showXHelp(PROGNAME, false);
-            }
             if(optionsHelper.listPlugins()) {
                 optionsHelper.listPlugins(true);
                 return EXIT_OK;

--- a/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties	Wed Feb 03 20:45:44 2016 +0530
+++ b/src/jdk.jlink/share/classes/jdk/tools/jimage/resources/jimage.properties	Thu Feb 04 12:24:26 2016 +0530
@@ -32,9 +32,6 @@
 main.opt.help=\
 \  --help                               Print this usage message
 
-main.opt.xhelp=\
-\  --xhelp                              Print advanced options
-
 main.opt.verbose=\
 \  --verbose                            Verbose listing
 

--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java	Wed Feb 03 20:45:44 2016 +0530
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java	Thu Feb 04 12:24:26 2016 +0530
@@ -95,9 +95,6 @@
         new Option<JlinkTask>(false, (task, opt, arg) -> {
             task.options.help = true;
         }, "--help"),
-        new Option<JlinkTask>(false, (task, opt, arg) -> {
-            task.options.xhelp = true;
-        }, "--xhelp"),
         new Option<JlinkTask>(true, (task, opt, arg) -> {
             String[] dirs = arg.split(File.pathSeparator);
             task.options.modulePath = new Path[dirs.length];
@@ -140,7 +137,7 @@
         new Option<JlinkTask>(false, (task, opt, arg) -> {
             task.options.version = true;
         }, "--version"),
-        new Option<JlinkTask>(false, (task, opt, arg) -> {
+        new HiddenOption<JlinkTask>(false, (task, opt, arg) -> {
             task.options.genbom = true;
         }, "--genbom"),
         new HiddenOption<JlinkTask>(false, (task, opt, arg) -> {
@@ -170,7 +167,6 @@
 
     static class OptionsValues {
         boolean help;
-        boolean xhelp;
         boolean genbom;
         boolean version;
         boolean fullVersion;
@@ -191,10 +187,6 @@
                 optionsHelper.showHelp(PROGNAME);
                 return EXIT_OK;
             }
-            if (options.xhelp) {
-                optionsHelper.showXHelp(PROGNAME, true);
-                return EXIT_OK;
-            }
             if(optionsHelper.listPlugins()) {
                 optionsHelper.listPlugins(true);
                 return EXIT_OK;

--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java	Wed Feb 03 20:45:44 2016 +0530
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java	Thu Feb 04 12:24:26 2016 +0530
@@ -550,10 +550,6 @@
                     });
         }
 
-        public void showXHelp(String progName, boolean showsImageBuilder) {
-            showHelp(progName, true, showsImageBuilder);
-        }
-
         public void listPlugins(boolean showsImageBuilder) {
             log.println("\n" + bundleHelper.getMessage("main.extended.help"));
             List<Plugin> pluginList = PluginRepository.

--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties	Wed Feb 03 20:45:44 2016 +0530
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties	Thu Feb 04 12:24:26 2016 +0530
@@ -12,9 +12,6 @@
 main.opt.help=\
 \  --help                               Print this help message
 
-main.opt.xhelp=\
-\  --xhelp                              Print advanced options
-
 main.opt.version=\
 \  --version                            Version information
 

--- a/test/jdk/jigsaw/tools/jlink/JLinkTest.java	Wed Feb 03 20:45:44 2016 +0530
+++ b/test/jdk/jigsaw/tools/jlink/JLinkTest.java	Thu Feb 04 12:24:26 2016 +0530
@@ -121,17 +121,6 @@
         }
 
         {
-            // XHelp
-            StringWriter writer = new StringWriter();
-            jdk.tools.jlink.internal.Main.run(new String[]{"--xhelp"}, new PrintWriter(writer));
-            String output = writer.toString();
-            if (output.split("\n").length < 20) {
-                System.err.println(output);
-                throw new AssertionError("XHelp");
-            }
-        }
-
-        {
             // License files
             String copied = "LICENSE";
             String[] arr = copied.split(",");