Index: applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 14015)
+++ applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 14120)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Another plugin to match images to the waypoints in a GPX file. A match is made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches the filename of an image."/>
                 <attribute name="Plugin-Early" value="false"/>
-                <attribute name="Plugin-Mainversion" value="1465"/>
+                <attribute name="Plugin-Mainversion" value="1498"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 14015)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 14120)
@@ -11,11 +11,9 @@
 
 import javax.swing.JFileChooser;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
 import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -98,22 +96,6 @@
      */
     public ImageWayPointPlugin() {
-    // find the File menu
-    final JMenuBar menuBar = Main.main.menu;
-    JMenu fileMenu = null;
-
-    if (null != menuBar) {
-        for (int index = 0; index < menuBar.getMenuCount()
-            && null == fileMenu; index++) {
-        if (I18n.tr("File").equals(menuBar.getMenu(index).getText())) {
-            fileMenu = menuBar.getMenu(index);
-        }
-        }
-    }
-
-    if (null != fileMenu) {
-        // now create our 'load' menu item and add to the file menu
-        final JMenuItem menuItem = new JMenuItem(new LoadImagesAction(this));
-        fileMenu.add(menuItem, 2);
-    }
+        MainMenu menu = Main.main.menu;
+        menu.add(menu.fileMenu, new LoadImagesAction(this));
     }