Index: /applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java
===================================================================
--- /applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java	(revision 13763)
+++ /applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/io/TcxReader.java	(revision 13764)
@@ -103,10 +103,13 @@
         WayPoint waypt = new WayPoint(new LatLon(p.getLatitudeDegrees(),
                                                  p.getLongitudeDegrees()));
-        // If WayPoint handled elevation data, we could get it from
-        // tp.getAltitudeMeters().
+        Double altitudeMeters = tp.getAltitudeMeters();
+        if (altitudeMeters != null) {
+            waypt.attr.put("ele", altitudeMeters.toString());
+        }
 
         XMLGregorianCalendar time = tp.getTime();
 
         if (time != null) {
+            waypt.attr.put("time", time.toString());
             waypt.time = .001 * time.toGregorianCalendar().getTimeInMillis();
         }
@@ -141,5 +144,5 @@
                                                 waypt.attr.put("name",
                                                                startTime
-							       .toString());
+                                                               .toString());
                                                 startTime = null;
                                             }