diff --git a/data/test_data/gpx/export_test.gpx b/data/test_data/gpx/export_test.gpx
index c6c43ad644..e4ad3c1d3d 100644
--- a/data/test_data/gpx/export_test.gpx
+++ b/data/test_data/gpx/export_test.gpx
@@ -8,6 +8,10 @@
   <name>Point 1</name>
   <cmt>Point 1</cmt>
 </wpt>
+<wpt lat="48.209847" lon="16.376028">
+  <name><![CDATA[Point cdata name ><&"]]></name>
+  <cmt><![CDATA[Point cdata cmt ><&"]]></cmt>
+</wpt>
 <trk>
   <name>Some random route</name>
   <extensions>
@@ -32,4 +36,13 @@
     </trkpt>
   </trkseg>
 </trk>
+<trk>
+  <name><![CDATA[Track cdata name ><&"]]></name>
+  <cmt><![CDATA[Track cdata cmt ><&"]]></cmt>
+  <trkseg>
+    <trkpt lat="48.209846" lon="16.376023">
+      <ele>123</ele>
+    </trkpt>
+  </trkseg>
+</trk>
 </gpx>
\ No newline at end of file
diff --git a/kml/serdes_gpx.cpp b/kml/serdes_gpx.cpp
index d5fbb2660a..1d89cff465 100644
--- a/kml/serdes_gpx.cpp
+++ b/kml/serdes_gpx.cpp
@@ -508,8 +508,11 @@ void SaveBookmarkData(Writer & writer, BookmarkData const & bookmarkData)
   if (!name)
     name = GetDefaultLanguage(bookmarkData.m_name);  // Original POI name stored when bookmark was created.
   if (name)
-    writer << kIndent2 << "<name>" << *name << "</name>\n";
-
+  {
+    writer << kIndent2 << "<name>";
+    SaveStringWithCDATA(writer, name.value());
+    writer << "</name>\n";
+  }
   if (auto const description = GetDefaultLanguage(bookmarkData.m_description))
   {
     writer << kIndent2 << "<cmt>";
@@ -540,7 +543,17 @@ void SaveTrackData(Writer & writer, TrackData const & trackData)
   writer << "<trk>\n";
   auto name = GetDefaultLanguage(trackData.m_name);
   if (name.has_value())
-    writer << kIndent2 << "<name>" << name.value() << "</name>\n";
+  {
+    writer << kIndent2 << "<name>";
+    SaveStringWithCDATA(writer, name.value());
+    writer << "</name>\n";
+  }
+  if (auto const description = GetDefaultLanguage(trackData.m_description))
+  {
+    writer << kIndent2 << "<cmt>";
+    SaveStringWithCDATA(writer, description.value());
+    writer << "</cmt>\n";
+  }
   if (auto const color = TrackColor(trackData); color != kDefaultTrackColor)
   {
     writer << kIndent2 << "<extensions>\n" << kIndent4 << "<color>";