Index: /applications/editors/josm/plugins/routes/build.xml
===================================================================
--- /applications/editors/josm/plugins/routes/build.xml	(revision 19063)
+++ /applications/editors/josm/plugins/routes/build.xml	(revision 19064)
@@ -27,6 +27,6 @@
 <project name="routes" default="dist" basedir=".">
 
-	<property name="commit.message" value="Update to JOSM 2616" />
-	<property name="plugin.main.version" value="2616" />
+	<property name="commit.message" value="Update to JOSM 2621" />
+	<property name="plugin.main.version" value="2621" />
 
 	<property name="josm"                   location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java
===================================================================
--- /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java	(revision 19063)
+++ /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java	(revision 19064)
@@ -15,7 +15,9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
+
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.routes.xml.Routes;
@@ -28,6 +30,5 @@
     
     public RoutesPlugin() {
-        Layer.listeners.add(this);
-        
+    	MapView.addLayerChangeListener(this);
         
         File routesFile = new File(getPluginDir() + File.separator + "routes.xml");