diff --git a/data/test_data/gpx/export_test.gpx b/data/test_data/gpx/export_test.gpx
index e4ad3c1d3d..d6ef83e97e 100644
--- a/data/test_data/gpx/export_test.gpx
+++ b/data/test_data/gpx/export_test.gpx
@@ -6,11 +6,11 @@
 </metadata>
 <wpt lat="48.209846" lon="16.376023">
   <name>Point 1</name>
-  <cmt>Point 1</cmt>
+  <desc>Point 1</desc>
 </wpt>
 <wpt lat="48.209847" lon="16.376028">
   <name><![CDATA[Point cdata name ><&"]]></name>
-  <cmt><![CDATA[Point cdata cmt ><&"]]></cmt>
+  <desc><![CDATA[Point cdata desc ><&"]]></desc>
 </wpt>
 <trk>
   <name>Some random route</name>
@@ -38,7 +38,7 @@
 </trk>
 <trk>
   <name><![CDATA[Track cdata name ><&"]]></name>
-  <cmt><![CDATA[Track cdata cmt ><&"]]></cmt>
+  <desc><![CDATA[Track cdata desc ><&"]]></desc>
   <trkseg>
     <trkpt lat="48.209846" lon="16.376023">
       <ele>123</ele>
diff --git a/kml/serdes_gpx.cpp b/kml/serdes_gpx.cpp
index 1d89cff465..2cb5d30e44 100644
--- a/kml/serdes_gpx.cpp
+++ b/kml/serdes_gpx.cpp
@@ -515,9 +515,9 @@ void SaveBookmarkData(Writer & writer, BookmarkData const & bookmarkData)
   }
   if (auto const description = GetDefaultLanguage(bookmarkData.m_description))
   {
-    writer << kIndent2 << "<cmt>";
+    writer << kIndent2 << "<desc>";
     SaveStringWithCDATA(writer, description.value());
-    writer << "</cmt>\n";
+    writer << "</desc>\n";
   }
   writer << "</wpt>\n";
 }
@@ -550,9 +550,9 @@ void SaveTrackData(Writer & writer, TrackData const & trackData)
   }
   if (auto const description = GetDefaultLanguage(trackData.m_description))
   {
-    writer << kIndent2 << "<cmt>";
+    writer << kIndent2 << "<desc>";
     SaveStringWithCDATA(writer, description.value());
-    writer << "</cmt>\n";
+    writer << "</desc>\n";
   }
   if (auto const color = TrackColor(trackData); color != kDefaultTrackColor)
   {