diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index a8ee693ec4..55642e4e21 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -251,3 +251,4 @@
  - [Utku Özdemir](https://github.com/utkuozdemir)
  - [JPUC1143](https://github.com/Jpuc1143/)
  - [0x25CBFC4F](https://github.com/0x25CBFC4F)
+ - [Robert Lützner](https://github.com/rluetzner)
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 7b510a3379..90035f18f1 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -66,6 +66,11 @@ namespace MediaBrowser.Model.Net
         {
             // Type application
             { ".azw3", "application/vnd.amazon.ebook" },
+            { ".cb7", "application/x-cb7" },
+            { ".cba", "application/x-cba" },
+            { ".cbr", "application/vnd.comicbook-rar" },
+            { ".cbt", "application/x-cbt" },
+            { ".cbz", "application/vnd.comicbook+zip" },
 
             // Type image
             { ".tbn", "image/jpeg" },
@@ -98,6 +103,12 @@ namespace MediaBrowser.Model.Net
         private static readonly Dictionary<string, string> _extensionLookup = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
             // Type application
+            { "application/vnd.comicbook-rar", ".cbr" },
+            { "application/vnd.comicbook+zip", ".cbz" },
+            { "application/x-cb7", ".cb7" },
+            { "application/x-cba", ".cba" },
+            { "application/x-cbr", ".cbr" },
+            { "application/x-cbt", ".cbt" },
             { "application/x-cbz", ".cbz" },
             { "application/x-javascript", ".js" },
             { "application/xml", ".xml" },
diff --git a/tests/Jellyfin.Model.Tests/Net/MimeTypesTests.cs b/tests/Jellyfin.Model.Tests/Net/MimeTypesTests.cs
index ccdf017580..a18a85ec0f 100644
--- a/tests/Jellyfin.Model.Tests/Net/MimeTypesTests.cs
+++ b/tests/Jellyfin.Model.Tests/Net/MimeTypesTests.cs
@@ -6,6 +6,11 @@ namespace Jellyfin.Model.Tests.Net
     public class MimeTypesTests
     {
         [Theory]
+        [InlineData(".cb7", "application/x-cb7")]
+        [InlineData(".cba", "application/x-cba")]
+        [InlineData(".cbr", "application/vnd.comicbook-rar")]
+        [InlineData(".cbt", "application/x-cbt")]
+        [InlineData(".cbz", "application/vnd.comicbook+zip")]
         [InlineData(".dll", "application/octet-stream")]
         [InlineData(".log", "text/plain")]
         [InlineData(".srt", "application/x-subrip")]
@@ -94,10 +99,16 @@ namespace Jellyfin.Model.Tests.Net
         [InlineData("application/pdf", ".pdf")]
         [InlineData("application/ttml+xml", ".ttml")]
         [InlineData("application/vnd.amazon.ebook", ".azw")]
+        [InlineData("application/vnd.comicbook-rar", ".cbr")]
+        [InlineData("application/vnd.comicbook+zip", ".cbz")]
         [InlineData("application/vnd.ms-fontobject", ".eot")]
         [InlineData("application/vnd.rar", ".rar")]
         [InlineData("application/wasm", ".wasm")]
         [InlineData("application/x-7z-compressed", ".7z")]
+        [InlineData("application/x-cb7", ".cb7")]
+        [InlineData("application/x-cba", ".cba")]
+        [InlineData("application/x-cbr", ".cbr")]
+        [InlineData("application/x-cbt", ".cbt")]
         [InlineData("application/x-cbz", ".cbz")]
         [InlineData("application/x-javascript", ".js")]
         [InlineData("application/x-mobipocket-ebook", ".mobi")]