diff --git a/mbox2web b/mbox2web
index 19c4f7a..ceae0cd 100755
--- a/mbox2web
+++ b/mbox2web
@@ -64,6 +64,7 @@ def save_part(msg, disposition):
         "application/x-perl":       ".pl",
         "application/msword":       ".doc",
         "application/ms-tnef":      ".ms-tnef",
+        "application/x-bzip2":      ".bz2", # more likely tar.bz2, but we can't know without looking into it which we ain't
     }[content_type]
 
     name = msg.get_param("name") or "(data)"
diff --git a/templates/attachment_application_x-bzip2.html b/templates/attachment_application_x-bzip2.html
new file mode 100644
index 0000000..638a4ff
--- /dev/null
+++ b/templates/attachment_application_x-bzip2.html
@@ -0,0 +1,9 @@
+<div class="partouter">
+    <div class="partheader">
+        application/x-bzip2
+    </div>
+    <div class="partinner">
+        <a href="{{url}}">{{name}}</a>
+    </div>
+</div>
+