diff --git a/mbox2web b/mbox2web
index 4019a68..d1fcdf1 100755
--- a/mbox2web
+++ b/mbox2web
@@ -94,6 +94,7 @@ def save_part(msg, disposition):
         "application/x-gunzip":      ".gz", # that sort of makes sense, but not really
         "image/jpeg":                ".jpg",
         "text/x-python":             ".py",
+        "text/x-java":               ".java",
     }[content_type]
 
     name = msg.get_param("name") or "(data)"
diff --git a/templates/attachment_text_x-java.html b/templates/attachment_text_x-java.html
new file mode 100644
index 0000000..72079ff
--- /dev/null
+++ b/templates/attachment_text_x-java.html
@@ -0,0 +1,8 @@
+<div class="partouter">
+    <div class="partheader">
+        text/x-c
+    </div>
+    <div class="partinner">
+        <a href="{{url}}">{{name}}</a>
+    </div>
+</div>