diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
index c14767a7a8c..664ebc4c9c6 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
@@ -33,6 +33,8 @@ import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.Collator;
+import java.util.Collection;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
@@ -45,7 +47,6 @@ import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.StringJoiner;
 import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -323,12 +324,13 @@ public enum Option {
 
         @Override
         protected void help(Log log) {
-            StringJoiner sj = new StringJoiner(", ");
+            List<String> releases = new ArrayList<>();
             for(Source source :  Source.values()) {
                 if (source.isSupported())
-                    sj.add(source.name);
+                    releases.add(source.name);
             }
-            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, sj.toString()));
+            String formatted = formatAbbreviatedList(releases);
+            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, formatted));
         }
     },
 
@@ -344,12 +346,13 @@ public enum Option {
 
         @Override
         protected void help(Log log) {
-            StringJoiner sj = new StringJoiner(", ");
+            List<String> releases = new ArrayList<>();
             for(Target target :  Target.values()) {
                 if (target.isSupported())
-                    sj.add(target.name);
+                    releases.add(target.name);
             }
-            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, sj.toString()));
+            String formatted = formatAbbreviatedList(releases);
+            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, formatted));
         }
     },
 
@@ -364,15 +367,8 @@ public enum Option {
                                                                                            false))
                                                  .collect(Collectors.toCollection(LinkedHashSet :: new));
 
-            StringBuilder targets = new StringBuilder();
-            String delim = "";
-            for (String platform : platforms) {
-                targets.append(delim);
-                targets.append(platform);
-                delim = ", ";
-            }
-
-            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, targets.toString()));
+            String formatted = formatAbbreviatedList(platforms);
+            super.help(log, log.localize(PrefixKind.JAVAC, descrKey, formatted));
         }
     },
 
@@ -1369,6 +1365,41 @@ public enum Option {
         log.printRawLines(WriterKind.STDOUT, LARGE_INDENT + descr.replace("\n", "\n" + LARGE_INDENT));
     }
 
+    /**
+     * Formats a collection of values as an abbreviated, comma separated list
+     * for use in javac help output.
+     *
+     * This helper assumes that the supported values form a dense sequence
+     * between the fourth and the (n - 3)rd entries.
+     * That matches the current policy for these values but is not
+     * guaranteed, and should be reconsidered if the structure of the values changes.
+     *
+     * @param values the values to format
+     * @return a comma separated representation of the values
+     */
+    private static String formatAbbreviatedList(Collection<String> values) {
+        List<String> list = (values instanceof List)
+                ? (List<String>) values
+                : new ArrayList<>(values);
+
+        int size = list.size();
+        if (size == 0) {
+            return "";
+        }
+        if (size <= 6) {
+            return String.join(", ", list);
+        }
+        StringJoiner sj = new StringJoiner(", ");
+        for (int i = 0; i < 3; i++) {
+            sj.add(list.get(i));
+        }
+        sj.add("...");
+        for (int i = size - 3; i < size; i++) {
+            sj.add(list.get(i));
+        }
+        return sj.toString();
+    }
+
     /**
      * Composes the initial synopsis of one of the forms for this option.
      * @param name the name of this form of the option
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
index d5ee9469d22..7824772b1f3 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -100,7 +100,8 @@ javac.opt.arg.Werror=\
     <key>(,<key>)*
 javac.opt.Werror.custom=\
     Specify lint categories for which warnings should terminate compilation,\n\
-    separated by comma. Precede a key by ''-'' to exclude the specified category.\n\
+    separated by comma.\n\
+    Precede a key by ''-'' to exclude the specified category.\n\
     Use --help-lint to see the supported keys.
 javac.opt.A=\
     Options to pass to annotation processors
@@ -358,7 +359,8 @@ javac.opt.prefer=\
     are found for an implicitly compiled class
 # L10N: do not localize: ''preview''
 javac.opt.preview=\
-    Enable preview language features. Also disables the ''preview'' lint category.\n\
+    Enable preview language features.\n\
+    Also disables the ''preview'' lint category.\n\
     To be used in conjunction with either -source or --release.
 javac.opt.AT=\
     Read options and filenames from file
diff --git a/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java b/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
index 4cef7e1916b..f46ef0219b5 100644
--- a/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
+++ b/test/langtools/tools/javac/options/HelpOutputColumnWidthTest.java
@@ -47,7 +47,7 @@ import toolbox.Task;
 
 public class HelpOutputColumnWidthTest extends TestRunner {
 
-    public static final int MAX_COLUMNS = 84;
+    public static final int MAX_COLUMNS = 80;
 
     protected ToolBox tb;