Index: applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java
===================================================================
--- applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java	(revision 33721)
+++ applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java	(revision 33722)
@@ -290,5 +290,5 @@
                     if (prevWp != null && wp.time != prevWp.time) {
                         vel = wp.getCoor().greatCircleDistance(prevWp.getCoor())/
-                                (wp.time-prevWp.time)*3.6;
+                                (wp.time-prevWp.time);
                     }
                     infoPanel.setData(wp, trk, vel, gpxL.data.tracks);
Index: applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java
===================================================================
--- applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java	(revision 33721)
+++ applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoPanel.java	(revision 33722)
@@ -19,4 +19,5 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
@@ -111,6 +112,10 @@
             but2.setVisible(true);
         }
-        if (vel > 0) label2.setText(String.format("%.1f "+tr("km/h"), vel));
-        else label2.setText(null);
+        if (vel > 0) {
+            SystemOfMeasurement som = SystemOfMeasurement.getSystemOfMeasurement();
+            label2.setText(String.format("%.1f "+som.speedName, vel * som.speedValue));
+        } else {
+            label2.setText(null);
+        }
         String s = (String) trk.getAttributes().get("name");
         if (s != null)