diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index 93104ce34e..9df11231e7 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -175,6 +175,19 @@ class RepairMimeTypes implements IRepairStep {
 		return $this->updateMimetypes($updatedMimetypes);
 	}
 
+	private function introduceComicbookTypes() {
+		$updatedMimetypes = [
+			'cb7' => 'application/comicbook+7z',
+			'cba' => 'application/comicbook+ace',
+			'cbr' => 'application/comicbook+rar',
+			'cbt' => 'application/comicbook+tar',
+			'cbtc' => 'application/comicbook+truecrypt',
+			'cbz' => 'application/comicbook+zip',
+		];
+
+		return $this->updateMimetypes($updatedMimetypes);
+	}
+
 	/**
 	 * Fix mime types
 	 */
@@ -208,5 +221,9 @@ class RepairMimeTypes implements IRepairStep {
 		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
 			$out->info('Fixed visio mime types');
 		}
+
+		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
+			$out->info('Fixed comicbook mime types');
+		}
 	}
 }
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 2f16e45a4a..e2771be6e8 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -21,12 +21,12 @@
 	"bmp": ["image/bmp"],
 	"bpg": ["image/bpg"],
 	"bz2": ["application/x-bzip2"],
-	"cb7": ["application/x-cbr"],
-	"cba": ["application/x-cbr"],
-	"cbr": ["application/x-cbr"],
-	"cbt": ["application/x-cbr"],
-	"cbtc": ["application/x-cbr"],
-	"cbz": ["application/x-cbr"],
+	"cb7": ["application/comicbook+7z"],
+	"cba": ["application/comicbook+ace"],
+	"cbr": ["application/comicbook+rar"],
+	"cbt": ["application/comicbook+tar"],
+	"cbtc": ["application/comicbook+truecrypt"],
+	"cbz": ["application/comicbook+zip"],
 	"cc": ["text/x-c"],
 	"cdr": ["application/coreldraw"],
 	"class": ["application/java"],
diff --git a/version.php b/version.php
index 93a2001444..5c288428c1 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 = array(14, 0, 0, 9);
+$OC_Version = array(14, 0, 0, 10);
 
 // The human readable string
 $OC_VersionString = '14.0.0 alpha';