Index: applications/editors/josm/plugins/waypoints/build.xml
===================================================================
--- applications/editors/josm/plugins/waypoints/build.xml	(revision 12566)
+++ applications/editors/josm/plugins/waypoints/build.xml	(revision 12575)
@@ -25,4 +25,5 @@
     <echo message="creating ${plugin.jar}"/>
     <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+      <compilerarg value="-Xlint:deprecation"/>
       <include name="**/*.java" />
     </javac>
@@ -30,13 +31,19 @@
 
   <target name="dist" depends="compile">
-    <!--
-	<copy todir="build/images">
-	  <fileset dir="images"></fileset>
-	</copy>
-	-->
-    <jar destfile="dist/waypoints.jar" basedir="build">
+    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+      <env key="LANG" value="C"/>
+      <arg value="info"/>
+      <arg value="--xml"/>
+      <arg value="."/>
+    </exec>
+    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+    <delete file="REVISION"/>
+    <jar destfile="${plugin.jar}" basedir="build">
       <manifest>
 	<attribute name="Plugin-Class" value="waypoints.WaypointPlugin" />
 	<attribute name="Plugin-Description" value="Automatic conversion of waypoints in a GPX file to OSM nodes." />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+        <attribute name="Plugin-Mainversion" value="1153" />
       </manifest>
     </jar>
Index: applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java
===================================================================
--- applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java	(revision 12566)
+++ applications/editors/josm/plugins/waypoints/src/WaypointOpenAction.java	(revision 12575)
@@ -21,4 +21,5 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.actions.DiskAccessAction;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
 
@@ -33,6 +34,7 @@
 	 */
 	public WaypointOpenAction() {
-		super(tr("Open waypoints file"), "open", tr("Open a waypoints file."), 
-						KeyEvent.VK_W, InputEvent.CTRL_DOWN_MASK);
+		super(tr("Open waypoints file"), "open", tr("Open a waypoints file."),
+		Shortcut.registerShortcut("tools:waypoints", tr("Menu: {0}",
+		tr("Open waypoints file")), KeyEvent.VK_W, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT));
 	}