diff --git a/00_tools/jaxb-ri/bin/xjc.bat b/00_tools/jaxb-ri/bin/xjc.bat
index f6e21f0d3c..42b0c100c2 100755
--- a/00_tools/jaxb-ri/bin/xjc.bat
+++ b/00_tools/jaxb-ri/bin/xjc.bat
@@ -65,7 +65,7 @@ set JAVA="%JAVA_HOME%\bin\java"
 goto LAUNCHXJC
 
 :LAUNCHXJC
-%JAVA% %XJC_OPTS% -cp "%JAXB_HOME%\lib\javax.activation.jar;%JAXB_HOME%\lib\jaxb-xjc.jar" com.sun.tools.xjc.XJCFacade %*
+%JAVA% %XJC_OPTS% -cp "%JAXB_HOME%\lib\*" com.sun.tools.xjc.XJCFacade %*
 
 :END
 %COMSPEC% /C exit %ERRORLEVEL%
diff --git a/00_tools/jaxb-ri/bin/xjc.sh b/00_tools/jaxb-ri/bin/xjc.sh
index 61e43eea22..59e60f1950 100755
--- a/00_tools/jaxb-ri/bin/xjc.sh
+++ b/00_tools/jaxb-ri/bin/xjc.sh
@@ -84,4 +84,4 @@ else
     JAVA=java
 fi
 
-exec "$JAVA" $XJC_OPTS -cp "$JAXB_HOME/lib/javax.activation.jar:$JAXB_HOME/lib/jaxb-xjc.jar" com.sun.tools.xjc.XJCFacade "$@"
+exec "$JAVA" $XJC_OPTS -cp "$JAXB_HOME/lib/*" com.sun.tools.xjc.XJCFacade "$@"
diff --git a/00_tools/jaxb-ri/lib/FastInfoset.jar b/00_tools/jaxb-ri/lib/FastInfoset.jar
new file mode 100644
index 0000000000..6e91f1cec2
Binary files /dev/null and b/00_tools/jaxb-ri/lib/FastInfoset.jar differ
diff --git a/00_tools/jaxb-ri/lib/codemodel.jar b/00_tools/jaxb-ri/lib/codemodel.jar
new file mode 100644
index 0000000000..da5c8b1a13
Binary files /dev/null and b/00_tools/jaxb-ri/lib/codemodel.jar differ
diff --git a/00_tools/jaxb-ri/lib/dtd-parser.jar b/00_tools/jaxb-ri/lib/dtd-parser.jar
new file mode 100644
index 0000000000..5843301806
Binary files /dev/null and b/00_tools/jaxb-ri/lib/dtd-parser.jar differ
diff --git a/00_tools/jaxb-ri/lib/istack-commons-runtime.jar b/00_tools/jaxb-ri/lib/istack-commons-runtime.jar
new file mode 100644
index 0000000000..8f37e950be
Binary files /dev/null and b/00_tools/jaxb-ri/lib/istack-commons-runtime.jar differ
diff --git a/00_tools/jaxb-ri/lib/istack-commons-tools.jar b/00_tools/jaxb-ri/lib/istack-commons-tools.jar
new file mode 100644
index 0000000000..a2fa42b278
Binary files /dev/null and b/00_tools/jaxb-ri/lib/istack-commons-tools.jar differ
diff --git a/00_tools/jaxb-ri/lib/jakarta.activation-api.jar b/00_tools/jaxb-ri/lib/jakarta.activation-api.jar
new file mode 100644
index 0000000000..bbfb52ff01
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jakarta.activation-api.jar differ
diff --git a/00_tools/jaxb-ri/lib/jakarta.xml.bind-api-javadoc.jar b/00_tools/jaxb-ri/lib/jakarta.xml.bind-api-javadoc.jar
new file mode 100644
index 0000000000..bc321fe7c9
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jakarta.xml.bind-api-javadoc.jar differ
diff --git a/00_tools/jaxb-ri/lib/jakarta.xml.bind-api-sources.jar b/00_tools/jaxb-ri/lib/jakarta.xml.bind-api-sources.jar
new file mode 100644
index 0000000000..f92b68a764
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jakarta.xml.bind-api-sources.jar differ
diff --git a/00_tools/jaxb-ri/lib/jakarta.xml.bind-api.jar b/00_tools/jaxb-ri/lib/jakarta.xml.bind-api.jar
new file mode 100644
index 0000000000..b16236d561
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jakarta.xml.bind-api.jar differ
diff --git a/00_tools/jaxb-ri/lib/javax.activation.jar b/00_tools/jaxb-ri/lib/javax.activation.jar
deleted file mode 100644
index 9637479ad2..0000000000
Binary files a/00_tools/jaxb-ri/lib/javax.activation.jar and /dev/null differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-api.jar b/00_tools/jaxb-ri/lib/jaxb-api.jar
deleted file mode 100644
index 0817c083ad..0000000000
Binary files a/00_tools/jaxb-ri/lib/jaxb-api.jar and /dev/null differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-core.jar b/00_tools/jaxb-ri/lib/jaxb-core.jar
deleted file mode 100644
index 431e143a85..0000000000
Binary files a/00_tools/jaxb-ri/lib/jaxb-core.jar and /dev/null differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-impl.jar b/00_tools/jaxb-ri/lib/jaxb-impl.jar
deleted file mode 100644
index 6ae03f6109..0000000000
Binary files a/00_tools/jaxb-ri/lib/jaxb-impl.jar and /dev/null differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-jxc.jar b/00_tools/jaxb-ri/lib/jaxb-jxc.jar
deleted file mode 100644
index 5850136056..0000000000
Binary files a/00_tools/jaxb-ri/lib/jaxb-jxc.jar and /dev/null differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-runtime-javadoc.jar b/00_tools/jaxb-ri/lib/jaxb-runtime-javadoc.jar
new file mode 100644
index 0000000000..1241bc5650
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jaxb-runtime-javadoc.jar differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-runtime-sources.jar b/00_tools/jaxb-ri/lib/jaxb-runtime-sources.jar
new file mode 100644
index 0000000000..8237c6ccd8
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jaxb-runtime-sources.jar differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-runtime.jar b/00_tools/jaxb-ri/lib/jaxb-runtime.jar
new file mode 100644
index 0000000000..62f8719664
Binary files /dev/null and b/00_tools/jaxb-ri/lib/jaxb-runtime.jar differ
diff --git a/00_tools/jaxb-ri/lib/jaxb-xjc.jar b/00_tools/jaxb-ri/lib/jaxb-xjc.jar
index 7389fc170f..2200457123 100644
Binary files a/00_tools/jaxb-ri/lib/jaxb-xjc.jar and b/00_tools/jaxb-ri/lib/jaxb-xjc.jar differ
diff --git a/00_tools/jaxb-ri/lib/relaxng-datatype.jar b/00_tools/jaxb-ri/lib/relaxng-datatype.jar
new file mode 100644
index 0000000000..65b61d3be9
Binary files /dev/null and b/00_tools/jaxb-ri/lib/relaxng-datatype.jar differ
diff --git a/00_tools/jaxb-ri/lib/rngom.jar b/00_tools/jaxb-ri/lib/rngom.jar
new file mode 100644
index 0000000000..0d386bf337
Binary files /dev/null and b/00_tools/jaxb-ri/lib/rngom.jar differ
diff --git a/00_tools/jaxb-ri/lib/stax-ex.jar b/00_tools/jaxb-ri/lib/stax-ex.jar
new file mode 100644
index 0000000000..a200db5329
Binary files /dev/null and b/00_tools/jaxb-ri/lib/stax-ex.jar differ
diff --git a/00_tools/jaxb-ri/lib/txw2.jar b/00_tools/jaxb-ri/lib/txw2.jar
new file mode 100644
index 0000000000..0d5ac012dd
Binary files /dev/null and b/00_tools/jaxb-ri/lib/txw2.jar differ
diff --git a/00_tools/jaxb-ri/lib/xsom.jar b/00_tools/jaxb-ri/lib/xsom.jar
new file mode 100644
index 0000000000..06ddb29707
Binary files /dev/null and b/00_tools/jaxb-ri/lib/xsom.jar differ