diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 2c508ec4fa..2a1e848578 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -56,6 +56,7 @@
 	"application/vnd.visio": "x-office/document",
 	"application/vnd.wordperfect": "x-office/document",
 	"application/x-7z-compressed": "package/x-generic",
+	"application/x-bzip2": "package/x-generic",
 	"application/x-cbr": "text",
 	"application/x-compressed": "package/x-generic",
 	"application/x-dcraw": "image",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 3498172f1d..16f5027d62 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -19,6 +19,7 @@
 	"bin": ["application/x-bin"],
 	"bmp": ["image/bmp"],
 	"bpg": ["image/bpg"],
+	"bz2": ["application/x-bzip2"],
 	"cb7": ["application/x-cbr"],
 	"cba": ["application/x-cbr"],
 	"cbr": ["application/x-cbr"],
@@ -148,7 +149,9 @@
 	"svg": ["image/svg+xml", "text/plain"],
 	"swf": ["application/x-shockwave-flash", "application/octet-stream"],
 	"tar": ["application/x-tar"],
+	"tar.bz2": ["application/x-bzip2"],
 	"tar.gz": ["application/x-compressed"],
+	"tbz2": ["application/x-bzip2"],
 	"tex": ["application/x-tex"],
 	"tgz": ["application/x-compressed"],
 	"tiff": ["image/tiff"],
diff --git a/version.php b/version.php
index 708f02ba4b..ffbafb72fe 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 1, 0, 5);
+$OC_Version = array(9, 1, 0, 6);
 
 // The human readable string
 $OC_VersionString = '9.1.0 beta 1';