Index: /applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- /applications/editors/josm/plugins/geotools/.classpath	(revision 31751)
+++ /applications/editors/josm/plugins/geotools/.classpath	(revision 31752)
@@ -72,9 +72,14 @@
 	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jaiext
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jaiext	(revision 31752)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/registryFile.jaiext	(revision 31752)
@@ -0,0 +1,15 @@
+#
+# Image operation descriptors :
+#
+descriptor  it.geosolutions.jaiext.colorconvert.ColorConvertDescriptor
+descriptor  it.geosolutions.jaiext.warp.WarpDescriptor
+descriptor  it.geosolutions.jaiext.stats.StatisticsDescriptor
+descriptor  it.geosolutions.jaiext.zonal.ZonalStatsDescriptor
+
+#
+# "rendered" factory objects
+#
+rendered  it.geosolutions.jaiext.colorconvert.ColorConvertCRIF  it.geosolutions.jaiext  ColorConvert ColorConvert
+rendered  it.geosolutions.jaiext.warp.WarpRIF  it.geosolutions.jaiext  Warp Warp 
+rendered  it.geosolutions.jaiext.stats.StatisticsRIF  it.geosolutions.jaiext  Stats Stats
+rendered  it.geosolutions.jaiext.zonal.ZonalStatsRIF  it.geosolutions.jaiext  Zonal Zonal
Index: /applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java	(revision 31751)
+++ /applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java	(revision 31752)
@@ -4,5 +4,9 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Iterator;
+import java.util.ServiceLoader;
 
+import javax.imageio.spi.IIORegistry;
+import javax.imageio.spi.IIOServiceProvider;
 import javax.media.jai.JAI;
 import javax.media.jai.OperationRegistry;
@@ -13,4 +17,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
@@ -65,4 +70,17 @@
             }
         }
+
+        // Manual registering because plugin jar is not on application classpath
+        IIORegistry ioRegistry = IIORegistry.getDefaultInstance();
+        ClassLoader loader = PluginHandler.getPluginClassLoader();
+
+        Iterator<Class<?>> categories = ioRegistry.getCategories();
+        while (categories.hasNext()) {
+            @SuppressWarnings("unchecked")
+            Iterator<IIOServiceProvider> riter = ServiceLoader.load((Class<IIOServiceProvider>)categories.next(), loader).iterator();
+            while (riter.hasNext()) {
+                ioRegistry.registerServiceProvider(riter.next());
+            }
+        }
     }