Index: /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java
===================================================================
--- /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 15185)
+++ /applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java	(revision 15186)
@@ -170,6 +170,5 @@
                     wpt.attr.put("time", "1970-01-01T00:00:00");
                 } else {
-                    wpt.attr.put("time", tstamp);
-                    System.out.println("timestamp: "+tstamp);
+                    wpt.attr.put("time", WayPoint.GPXTIMEFMT.format(tstamp));
                 }
                 wpt.setTime();
@@ -189,5 +188,5 @@
                 wpt.attr.put("time", "1970-01-01T00:00:00");
             } else {
-                wpt.attr.put("time", tstamp);
+                wpt.attr.put("time", WayPoint.GPXTIMEFMT.format(tstamp));
             }
             wpt.setTime();