Index: /applications/editors/josm/plugins/eventbus/build.xml
===================================================================
--- /applications/editors/josm/plugins/eventbus/build.xml	(revision 34507)
+++ /applications/editors/josm/plugins/eventbus/build.xml	(revision 34508)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13558"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java
===================================================================
--- /applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java	(revision 34507)
+++ /applications/editors/josm/plugins/eventbus/src/org/openstreetmap/josm/plugins/eventbus/EventBusPlugin.java	(revision 34508)
@@ -6,5 +6,4 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.ExpertToggleAction.ExpertModeChangeListener;
@@ -12,4 +11,5 @@
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
@@ -38,4 +38,5 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSetListener;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -383,9 +384,9 @@
      */
     void registerAllJosmListeners() {
-        Main.addProjectionChangeListener(projectionChangeListener);
+        ProjectionRegistry.addProjectionChangeListener(projectionChangeListener);
         MainApplication.getLayerManager().addLayerChangeListener(layerChangeListener);
         MainApplication.getLayerManager().addActiveLayerChangeListener(activeLayerChangeListener);
         MainApplication.getLayerManager().addLayerAvailabilityListener(layerAvailabilityListener);
-        MainApplication.undoRedo.addCommandQueueListener(commandQueueListener);
+        UndoRedoHandler.getInstance().addCommandQueueListener(commandQueueListener);
         ChangesetCache.getInstance().addChangesetCacheListener(changesetCacheListener);
         DataSet.addSelectionListener(selectionChangedListener);
@@ -406,9 +407,9 @@
      */
     void unregisterAllJosmListeners() {
-        Main.removeProjectionChangeListener(projectionChangeListener);
+        ProjectionRegistry.removeProjectionChangeListener(projectionChangeListener);
         MainApplication.getLayerManager().removeLayerChangeListener(layerChangeListener);
         MainApplication.getLayerManager().removeActiveLayerChangeListener(activeLayerChangeListener);
         MainApplication.getLayerManager().removeLayerAvailabilityListener(layerAvailabilityListener);
-        MainApplication.undoRedo.removeCommandQueueListener(commandQueueListener);
+        UndoRedoHandler.getInstance().removeCommandQueueListener(commandQueueListener);
         ChangesetCache.getInstance().removeChangesetCacheListener(changesetCacheListener);
         DataSet.removeSelectionListener(selectionChangedListener);