diff --git a/lib/private/Repair/RepairMimeTypes.php b/lib/private/Repair/RepairMimeTypes.php
index 4d15dda45dd37..b204c27a9a223 100644
--- a/lib/private/Repair/RepairMimeTypes.php
+++ b/lib/private/Repair/RepairMimeTypes.php
@@ -246,6 +246,14 @@ private function introduceEmlAndMsgFormatType() {
 		return $this->updateMimetypes($updatedMimetypes);
 	}
 
+	private function introduceAacAudioType() {
+		$updatedMimetypes = [
+			'aac' => 'audio/aac',
+		];
+
+		return $this->updateMimetypes($updatedMimetypes);
+	}
+
 	/**
 	 * Fix mime types
 	 */
@@ -310,5 +318,9 @@ public function run(IOutput $out) {
 		if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) {
 			$out->info('Fixed eml and msg mime type');
 		}
+
+		if (version_compare($ocVersionFromBeforeUpdate, '29.0.0.6', '<') && $this->introduceAacAudioType()) {
+			$out->info('Fixed aac mime type');
+		}
 	}
 }
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index c98e33756b667..05bcbec7fbbb6 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -9,6 +9,7 @@
 
 	"3gp": ["video/3gpp"],
 	"7z": ["application/x-7z-compressed"],
+	"aac": ["audio/aac"],
 	"accdb": ["application/msaccess"],
 	"adoc": ["text/asciidoc", "text/plain"],
 	"ai": ["application/illustrator"],
diff --git a/version.php b/version.php
index a1855bfad5aa2..48c9498ea66ad 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, 5];
+$OC_Version = [29, 0, 0, 6];
 
 // The human-readable string
 $OC_VersionString = '29.0.0 dev';