Index: applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- applications/editors/josm/plugins/piclayer/build.xml	(revision 29784)
+++ applications/editors/josm/plugins/piclayer/build.xml	(revision 29805)
@@ -3,5 +3,5 @@
     <property name="commit.message" value="PicLayer - #8743 - fixed NPE when removing last layer"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="6088"/>
+    <property name="plugin.main.version" value="6097"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/piclayer/nbproject/project.xml
===================================================================
--- applications/editors/josm/plugins/piclayer/nbproject/project.xml	(revision 29805)
+++ applications/editors/josm/plugins/piclayer/nbproject/project.xml	(revision 29805)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>PicLayer</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+            <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
+            <name>PicLayer</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>src</label>
+                    <type>java</type>
+                    <location>src</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>PicLayer</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+            </folders>
+            <ide-actions>
+                <action name="build">
+                    <target>compile</target>
+                </action>
+                <action name="clean">
+                    <target>clean</target>
+                </action>
+                <action name="run">
+                    <target>runjosm</target>
+                </action>
+                <action name="rebuild">
+                    <target>clean</target>
+                    <target>compile</target>
+                </action>
+            </ide-actions>
+            <view>
+                <items>
+                    <source-folder style="packages">
+                        <label>src</label>
+                        <location>src</location>
+                    </source-folder>
+                    <source-file>
+                        <location>build.xml</location>
+                    </source-file>
+                </items>
+                <context-menu>
+                    <ide-action name="build"/>
+                    <ide-action name="rebuild"/>
+                    <ide-action name="clean"/>
+                    <ide-action name="run"/>
+                </context-menu>
+            </view>
+        </general-data>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
+            <compilation-unit>
+                <package-root>src</package-root>
+                <classpath mode="compile">../../core/src</classpath>
+                <source-level>1.6</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>
Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java	(revision 29784)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java	(revision 29805)
@@ -21,19 +21,17 @@
 package org.openstreetmap.josm.plugins.piclayer;
 
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.JMenu;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.gui.IconToggleButton;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -64,6 +62,6 @@
 
     // Plugin menu
-    private JMenu menu = null;
-
+    JosmAction newLayerFromFileAction = new NewLayerFromFileAction();
+    JosmAction newLayerFromClipboardAction = new NewLayerFromClipboardAction();
     /**
      * Constructor...
@@ -73,15 +71,8 @@
 
         // Create menu entry
-        if ( Main.main.menu != null ) {
-            menu = Main.main.menu.addMenu(marktr("PicLayer") , KeyEvent.VK_L, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/PicLayer"));
-        }
-
+        
         // Add menu items
-        if ( menu != null ) {
-            menu.add(new NewLayerFromFileAction());
-            menu.add(new NewLayerFromClipboardAction());
-            menu.setEnabled(false);
-        }
-
+        MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromFileAction);
+        MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromClipboardAction);
         // Listen to layers
         MapView.addLayerChangeListener(this);
@@ -154,5 +145,6 @@
     @Override
     public void layerAdded(Layer arg0) {
-        menu.setEnabled(true);
+        newLayerFromClipboardAction.setEnabled(true);
+        newLayerFromClipboardAction.setEnabled(true);
     }
 
@@ -171,5 +163,6 @@
         // Why should I do all these checks now?
         boolean enable = Main.map != null && Main.map.mapView != null && Main.map.mapView.getAllLayers() != null && Main.map.mapView.getAllLayers().size() != 0;
-        menu.setEnabled(enable);
+        newLayerFromClipboardAction.setEnabled(enable);
+        newLayerFromClipboardAction.setEnabled(enable);
     }
 };