Index: applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- applications/editors/josm/plugins/geotools/build.xml	(revision 35900)
+++ applications/editors/josm/plugins/geotools/build.xml	(revision 35901)
@@ -58,4 +58,8 @@
                 <include name="META-INF/MANIFEST.MF"/>
                 <include name="META-INF/javax.media.jai.registryFile.jai"/>
+                <!-- Required by the JSR 385 implementation (indriya). See JOSM #21803 -->
+                <include name="META-INF/services/tech.units.indriya.spi.NumberSystem"/>
+                <include name="META-INF/services/org.geotools.*"/>
+                <include name="META-INF/services/org.opengis.*"/>
             </zipfileset>
         </jar>
