diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index 0d9e744b213..4d15dda45dd 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -240,7 +240,7 @@ class RepairMimeTypes implements IRepairStep {
 	private function introduceEmlAndMsgFormatType() {
 		$updatedMimetypes = [
 			'eml' => 'message/rfc822',
-			'msg' => 'application/x-ole-storage',
+			'msg' => 'application/vnd.ms-outlook',
 		];
 
 		return $this->updateMimetypes($updatedMimetypes);
@@ -307,7 +307,7 @@ class RepairMimeTypes implements IRepairStep {
 			$out->info('Fixed Enhanced Metafile Format mime types');
 		}
 
-		if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.1', '<') && $this->introduceEmlAndMsgFormatType()) {
+		if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) {
 			$out->info('Fixed eml and msg mime type');
 		}
 	}
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index b28dd42cd1e..c98e33756b6 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -123,7 +123,7 @@
 	"mpeg": ["video/mpeg"],
 	"mpg": ["video/mpeg"],
 	"mpo": ["image/jpeg"],
-	"msg": ["application/x-ole-storage", "text/plain"],
+	"msg": ["application/vnd.ms-outlook"],
 	"msi": ["application/x-msi"],
 	"mt2s": ["video/MP2T"],
 	"mts": ["video/MP2T"],
diff --git a/version.php b/version.php
index 65fd747e718..df6eb7ba390 100644
--- a/version.php
+++ b/version.php
@@ -30,7 +30,7 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level
 // when updating major/minor version number.
 
-$OC_Version = [29, 0, 0, 1];
+$OC_Version = [29, 0, 0, 2];
 
 // The human-readable string
 $OC_VersionString = '29.0.0 dev';