Index: /applications/editors/josm/plugins/jaxb/.classpath
===================================================================
--- /applications/editors/josm/plugins/jaxb/.classpath	(revision 35013)
+++ /applications/editors/josm/plugins/jaxb/.classpath	(revision 35014)
@@ -4,8 +4,22 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/javax.activation.jar"/>
-	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jaxb-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jaxb-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jaxb-impl.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/codemodel.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/dtd-parser.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/FastInfoset.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/istack-commons-runtime.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/istack-commons-tools.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jakarta.activation-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jakarta.xml.bind-api.jar" sourcepath="../00_tools/jaxb-ri/lib/jakarta.xml.bind-api-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jaxb-runtime.jar" sourcepath="../00_tools/jaxb-ri/lib/jaxb-runtime-sources.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/../00_tools/jaxb-ri/lib/jaxb-runtime-javadoc.jar!/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/jaxb-xjc.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/relaxng-datatype.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/rngom.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/stax-ex.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/txw2.jar"/>
+	<classpathentry exported="true" kind="lib" path="../00_tools/jaxb-ri/lib/xsom.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /applications/editors/josm/plugins/jaxb/build.xml
===================================================================
--- /applications/editors/josm/plugins/jaxb/build.xml	(revision 35013)
+++ /applications/editors/josm/plugins/jaxb/build.xml	(revision 35014)
@@ -39,7 +39,18 @@
                     <zips>
                         <fileset dir="${plugin.tools.dir}/jaxb-ri/lib">
-                            <include name="ja*.jar"/>
-                            <exclude name="jaxb-jxc.jar"/>
-                            <exclude name="jaxb-xjc.jar"/>
+                        	<exclude name="codemodel.jar"/>
+                        	<exclude name="dtd-parser.jar"/>
+                        	<include name="FastInfoset.jar"/>
+                        	<include name="istack-commons-runtime.jar"/>
+                        	<exclude name="istack-commons-tools.jar"/>
+                        	<include name="jakarta.activation-api.jar"/>
+                        	<include name="jakarta.xml.bind-api.jar"/>
+                        	<include name="jaxb-runtime.jar"/>
+                        	<exclude name="jaxb-xjc.jar"/>
+                        	<exclude name="relaxng-datatype.jar"/>
+                        	<exclude name="rngom.jar"/>
+                        	<include name="stax-ex.jar"/>
+                        	<include name="txw2.jar"/>
+                        	<exclude name="xsom.jar"/>
                             <exclude name="*-sources.jar"/>
                             <exclude name="*-javadoc.jar"/>