--- a/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template	Fri Sep 01 14:15:37 2017 +0000
+++ b/jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext/GB18030.java.template	Fri Sep 01 08:15:52 2017 -0700
@@ -60,11 +60,12 @@
                 || (cs.name().equals("ISO-8859-8"))
                 || (cs.name().equals("ISO-8859-9"))
                 || (cs.name().equals("ISO-8859-13"))
+                || (cs.name().equals("ISO-8859-15"))
+                || (cs.name().equals("ISO-8859-16"))
                 || (cs.name().equals("UTF-8"))
                 || (cs.name().equals("UTF-16"))
                 || (cs.name().equals("UTF-16LE"))
                 || (cs.name().equals("UTF-16BE"))
-                || (cs.name().equals("ISO-8859-15"))
                 || (cs.name().equals("windows-1251"))
                 || (cs.name().equals("windows-1252"))
                 || (cs.name().equals("windows-1253"))