diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index c384241b5ff5a95af488b91b9131392246564881..0bf35c1d2ae03501cedf53bf0c911f83a7319896 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -131,7 +131,10 @@ class RepairMimeTypes implements IRepairStep {
 
 	private function introduceLocationTypes() {
 		$updatedMimetypes = [
-			'gpx' => 'application/gpx+xml'
+			'gpx' => 'application/gpx+xml',
+			'kml' => 'application/vnd.google-earth.kml+xml',
+			'kmz' => 'application/vnd.google-earth.kmz',
+			'tcx' => 'application/vnd.garmin.tcx+xml',
 		];
 
 		$this->updateMimetypes($updatedMimetypes);
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index fef62ebebdb4b15e20d197f37c0606c42885c993..daf75453dc8800b485f7ec3aad2fddf52b9e5926 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -26,6 +26,9 @@
 	"application/rss+xml": "application/xml",
 	"application/vnd.android.package-archive": "package/x-generic",
 	"application/vnd.lotus-wordpro": "x-office/document",
+	"application/vnd.garmin.tcx+xml": "location",
+	"application/vnd.google-earth.kml+xml": "location",
+	"application/vnd.google-earth.kmz": "location",
 	"application/vnd.ms-excel": "x-office/spreadsheet",
 	"application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
 	"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index e06631a9ad8942da30e1c6db9192e6771ea581e7..ae90a138a42bf51315432ef4ea774b2597499aa8 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -82,6 +82,8 @@
 	"kdc": ["image/x-dcraw"],
 	"key": ["application/x-iwork-keynote-sffkey"],
 	"keynote": ["application/x-iwork-keynote-sffkey"],
+	"kml": ["application/vnd.google-earth.kml+xml"],
+	"kmz": ["application/vnd.google-earth.kmz"],
 	"kra": ["application/x-krita"],
 	"ldif": ["text/x-ldif"],
 	"lwp": ["application/vnd.lotus-wordpro"],
@@ -160,6 +162,7 @@
 	"tar.bz2": ["application/x-bzip2"],
 	"tar.gz": ["application/x-compressed"],
 	"tbz2": ["application/x-bzip2"],
+	"tcx": ["application/vnd.garmin.tcx+xml"],
 	"tex": ["application/x-tex"],
 	"tgz": ["application/x-compressed"],
 	"tiff": ["image/tiff"],