diff --git a/doc/config/conf.d/mime.conf b/doc/config/conf.d/mime.conf
index 953772127..0526f07c5 100644
--- a/doc/config/conf.d/mime.conf
+++ b/doc/config/conf.d/mime.conf
@@ -48,7 +48,7 @@ mimetype.assign = (
 	".gpkg.tar" => "application/vnd.gentoo.gpkg",
 	".1905.1" => "application/vnd.ieee.1905",
 	".syft.json" => "application/vnd.syft+json",
-	".tar.bz2" => "application/x-gtar-compressed",
+	".tar.bz2" => "application/x-bzip-compressed-tar",
 	".tar.gz" => "application/x-gtar-compressed",
 	".a2l" => "application/A2L",
 	".aml" => "application/AML",
@@ -117,7 +117,6 @@ mimetype.assign = (
 	".glbuf" => "application/gltf-buffer",
 	".gml" => "application/gml+xml",
 	".gz" => "application/gzip",
-	".tgz" => "application/gzip",
 	".stk" => "application/hyperstudio",
 	".ink" => "application/inkml+xml",
 	".inkml" => "application/inkml+xml",
@@ -978,6 +977,7 @@ mimetype.assign = (
 	".bcpio" => "application/x-bcpio",
 	".torrent" => "application/x-bittorrent",
 	".bz2" => "application/x-bzip2",
+	".tbz" => "application/x-bzip-compressed-tar",
 	".vcd" => "application/x-cdlink",
 	".crx" => "application/x-chrome-extension",
 	".cpio" => "application/x-cpio",
@@ -988,7 +988,7 @@ mimetype.assign = (
 	".dvi" => "application/x-dvi",
 	".spl" => "application/x-futuresplash",
 	".gtar" => "application/x-gtar",
-	".tbz" => "application/x-gtar-compressed",
+	".tgz" => "application/x-gtar-compressed",
 	".hdf" => "application/x-hdf",
 	".jnlp" => "application/x-java-jnlp-file",
 	".pack" => "application/x-java-pack200",
diff --git a/doc/scripts/create-mime.conf.pl b/doc/scripts/create-mime.conf.pl
index 2a51bdbf7..c30b3f4c8 100755
--- a/doc/scripts/create-mime.conf.pl
+++ b/doc/scripts/create-mime.conf.pl
@@ -177,10 +177,11 @@ sub print_type {
 
 # other useful mappings
 my %useful = (
+	".tgz"     => "application/x-gtar-compressed",
 	".tar.gz"  => "application/x-gtar-compressed",
 	".gz"      => "application/gzip",
-	".tbz"     => "application/x-gtar-compressed",
-	".tar.bz2" => "application/x-gtar-compressed",
+	".tbz"     => "application/x-bzip-compressed-tar",
+	".tar.bz2" => "application/x-bzip-compressed-tar",
 	".bz2"     => "application/x-bzip2",
 	".log"     => "text/plain",
 	".conf"    => "text/plain",
diff --git a/tests/lighttpd.conf b/tests/lighttpd.conf
index b6ef62061..6cb242f66 100644
--- a/tests/lighttpd.conf
+++ b/tests/lighttpd.conf
@@ -51,9 +51,9 @@ mimetype.assign = (
 	".swf"  => "application/x-shockwave-flash",
 	".spl"  => "application/futuresplash",
 	".txt"  => "text/plain",
-	".tar.gz" =>   "application/x-tgz",
-	".tgz"  => "application/x-tgz",
-	".gz"   => "application/x-gzip",
+	".tar.gz" =>   "application/x-gtar-compressed",
+	".tgz"  => "application/x-gtar-compressed",
+	".gz"   => "application/gzip",
 	".c"    => "text/plain",
 	".conf" => "text/plain",
 )