Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 2388)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 2389)
@@ -12,4 +12,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -205,4 +206,18 @@
 
     /**
+     * Replies the global help action, if available. Otherwise, creates an instance
+     * of {@see HelpAction}.
+     * 
+     * @return
+     */
+    static private Action getHelpAction() {
+        try {
+            return Main.main.menu.help;
+        } catch(NullPointerException e) {
+            return new HelpAction();
+        }
+    }
+
+    /**
      * Makes a component aware of context sensitive help.
      * 
@@ -210,5 +225,5 @@
      * code. Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor
      * is not.
-     *  
+     * 
      * @param component the component  the component
      * @param topic the help topic. Set to the default help topic if null.
@@ -219,5 +234,5 @@
         }
         component.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("F1"), "help");
-        component.getActionMap().put("help", Main.main.menu.help);
+        component.getActionMap().put("help", getHelpAction());
         component.putClientProperty("help", relativeHelpTopic);
     }
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 2388)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 2389)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.plugins;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -13,8 +14,6 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -33,5 +32,4 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -101,5 +99,5 @@
             if(Main.pref.getInteger("pluginmanager.version", 0) < v)
             {
-                doUpdate = tr("You updated your JOSM software\nTo prevent problems the plugins should be updated as well.\n"
+                doUpdate = tr("You updated your JOSM software.\nTo prevent problems the plugins should be updated as well.\n"
                         + "Update plugins now?");
                 check = "pluginmanger.version";
@@ -128,7 +126,9 @@
                 dialog.toggleEnable(check);
                 dialog.setButtonIcons( new String[] {"dialogs/refresh.png", "cancel.png"});
+                dialog.configureContextsensitiveHelp(ht("/Plugin/AutomaticUpdate"), true /* show help button */);
                 dialog.showDialog();
-                if(dialog.getValue() == 1)
+                if(dialog.getValue() == 1) {
                     new PluginSelection().update();
+                }
             }
         }