--- old/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java	2015-09-24 18:12:26.000000000 +0200
+++ new/src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/Options.java	2015-09-24 18:12:26.000000000 +0200
@@ -562,14 +562,6 @@
             schemaLanguage = Language.DTD;
             return 1;
         }
-        if (args[i].equals("-relaxng")) {
-            schemaLanguage = Language.RELAXNG;
-            return 1;
-        }
-        if (args[i].equals("-relaxng-compact")) {
-            schemaLanguage = Language.RELAXNG_COMPACT;
-            return 1;
-        }
         if (args[i].equals("-xmlschema")) {
             schemaLanguage = Language.XMLSCHEMA;
             return 1;
@@ -869,10 +861,6 @@
         if ((grammars != null) && (grammars.size() > 0)) {
             String name = grammars.get(0).getSystemId().toLowerCase();
 
-            if (name.endsWith(".rng"))
-                return Language.RELAXNG;
-            if (name.endsWith(".rnc"))
-                return Language.RELAXNG_COMPACT;
             if (name.endsWith(".dtd"))
                 return Language.DTD;
             if (name.endsWith(".wsdl"))