diff --git a/src/androidTest/res/raw/gpx11_timezone.gpx b/src/androidTest/res/raw/gpx11_timezone.gpx
index c6a342faf..ce37b1b22 100644
--- a/src/androidTest/res/raw/gpx11_timezone.gpx
+++ b/src/androidTest/res/raw/gpx11_timezone.gpx
@@ -28,10 +28,11 @@ xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/
 <opentracks:typeTranslated><![CDATA[unknown]]></opentracks:typeTranslated>
 <gpxtrkx:TrackStatsExtension>
 <gpxtrkx:Distance>0.0</gpxtrkx:Distance>
-<gpxtrkx:TimerTime>0</gpxtrkx:TimerTime>
+<gpxtrkx:TotalElapsedTime>0</gpxtrkx:TotalElapsedTime>
 <gpxtrkx:MovingTime>0</gpxtrkx:MovingTime>
 <gpxtrkx:StoppedTime>0</gpxtrkx:StoppedTime>
 <gpxtrkx:MaxSpeed>0.0</gpxtrkx:MaxSpeed>
+<gpxtrkx:MovingSpeed>0.0</gpxtrkx:MovingSpeed>
 </gpxtrkx:TrackStatsExtension>
 </extensions>
 <trkseg>
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
index e45e17509..05fa0864e 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/GPXTrackExporter.java
@@ -282,10 +282,11 @@ public class GPXTrackExporter implements TrackExporter {
         Statistics trackStatistics = track.statistics();
         printWriter.println("<gpxtrkx:TrackStatsExtension>");
         printWriter.println("<gpxtrkx:Distance>" + trackStatistics.totalDistance().toM() + "</gpxtrkx:Distance>");
-        printWriter.println("<gpxtrkx:TimerTime>" + trackStatistics.totalDuration().getSeconds() + "</gpxtrkx:TimerTime>");
+        printWriter.println("<gpxtrkx:TotalElapsedTime>" + trackStatistics.totalDuration().getSeconds() + "</gpxtrkx:TotalElapsedTime>");
         printWriter.println("<gpxtrkx:MovingTime>" + trackStatistics.movingDuration().getSeconds() + "</gpxtrkx:MovingTime>");
         printWriter.println("<gpxtrkx:StoppedTime>" + trackStatistics.getStoppedTime().getSeconds() + "</gpxtrkx:StoppedTime>");
         printWriter.println("<gpxtrkx:MaxSpeed>" + trackStatistics.maxSpeed().toMPS() + "</gpxtrkx:MaxSpeed>");
+        printWriter.println("<gpxtrkx:MovingSpeed>" + trackStatistics.getAverageMovingSpeed().toMPS() + "</gpxtrkx:MovingSpeed>");
         if (trackStatistics.altitudeGainLoss() != null) {
             printWriter.println("<gpxtrkx:Ascent>" + trackStatistics.altitudeGainLoss().gain_m() + "</gpxtrkx:Ascent>");
             printWriter.println("<gpxtrkx:Descent>" + trackStatistics.altitudeGainLoss().loss_m() + "</gpxtrkx:Descent>");