diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index b6b6ceed10..60a7df25f6 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -191,6 +191,17 @@ class RepairMimeTypes implements IRepairStep {
 		return $this->updateMimetypes($updatedMimetypes);
 	}
 
+	private function introduceOpenDocumentTemplates() {
+		$updatedMimetypes = [
+			'ott' => 'application/vnd.oasis.opendocument.text-template',
+			'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+			'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+			'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+		];
+
+		return $this->updateMimetypes($updatedMimetypes);
+	}
+
 	/**
 	 * Fix mime types
 	 */
@@ -227,5 +238,9 @@ class RepairMimeTypes implements IRepairStep {
 		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
 			$out->info('Fixed comicbook mime types');
 		}
+
+		if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
+			$out->info('Fixed OpenDocument template mime types');
+		}
 	}
 }
diff --git a/version.php b/version.php
index da3c3477ae..9457db90c7 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
 
-$OC_Version = [20, 0, 0, 4];
+$OC_Version = [20, 0, 0, 5];
 
 // The human readable string
 $OC_VersionString = '20.0.0 Beta 2';