--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java	Wed Dec 14 18:30:56 2016 -0800
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java	Thu Dec 15 11:47:25 2016 -0800
@@ -342,7 +342,7 @@
         }
     },
 
-    VERSION("-version", "opt.version", STANDARD, INFO) {
+    VERSION("--version -version", "opt.version", STANDARD, INFO) {
         @Override
         public void process(OptionHelper helper, String option) throws InvalidValueException {
             Log log = helper.getLog();
@@ -352,7 +352,7 @@
         }
     },
 
-    FULLVERSION("-fullversion", null, HIDDEN, INFO) {
+    FULLVERSION("--full-version -fullversion", null, HIDDEN, INFO) {
         @Override
         public void process(OptionHelper helper, String option) throws InvalidValueException {
             Log log = helper.getLog();
@@ -402,7 +402,7 @@
         }
     },
 
-    X("-X", "opt.X", STANDARD, INFO) {
+    X("--help-extra -X", "opt.X", STANDARD, INFO) {
         @Override
         public void process(OptionHelper helper, String option) throws InvalidValueException {
             Log log = helper.getLog();

--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties	Wed Dec 14 18:30:56 2016 -0800
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties	Thu Dec 15 11:47:25 2016 -0800
@@ -263,9 +263,9 @@
 javac.opt.Xstdout=\
     Redirect standard output
 javac.opt.X=\
-    Print a synopsis of nonstandard options
+    Print help on extra options
 javac.opt.help=\
-    Print a synopsis of standard options
+    Print this help message
 javac.opt.print=\
     Print out a textual representation of specified types
 javac.opt.printRounds=\
@@ -375,7 +375,7 @@
     use --help for a list of possible options
 
 javac.msg.usage.nonstandard.footer=\
-These options are non-standard and subject to change without notice.
+These extra options are subject to change without notice.
 
 javac.msg.bug=\
 An exception has occurred in the compiler ({0}). \