diff --git a/mbox2web b/mbox2web
index 1f15df4..0bf2a02 100755
--- a/mbox2web
+++ b/mbox2web
@@ -62,6 +62,7 @@ def save_part(msg, disposition):
         "image/gif":                ".gif",
         "text/x-c":                 ".c",
         "application/x-perl":       ".pl",
+        "application/msword":       ".doc",
     }[content_type]
 
     name = msg.get_param("name") or "(data)"
diff --git a/templates/attachment_application_msword.html b/templates/attachment_application_msword.html
new file mode 100644
index 0000000..2634f4d
--- /dev/null
+++ b/templates/attachment_application_msword.html
@@ -0,0 +1,8 @@
+<div class="partouter">
+    <div class="partheader">
+        application/msword
+    </div>
+    <div class="partinner">
+        <a href="{{url}}">{{name}}</a>
+    </div>
+</div>