diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 409e0d4..e4d88cd 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -854,6 +854,8 @@ if your face looked like a toaster and a t-rex put together? :(
 
 2.1.17
     - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
+    - add support for mailcap. Thanks to Pascal Brueckner.
+
 
 2.1.16
     - compatibility fix for vim7.2, cheers to Ben Schmidt, David Fishburn, and
@@ -1264,6 +1266,7 @@ Martin Kustermann                   pamconf
 Indriði Einarsson                   mason
 Chris                               map
 Krzysztof A. Adamski                group
+Pascal Brueckner                    mailcap
 
 ==============================================================================
 8. License                                                    *NERDComLicense*
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 1e1265a..8d8d9fd 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -487,6 +487,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('dnl ', '')
     elseif a:filetype == "mail"
         call s:MapDelimiters('> ','')
+    elseif a:filetype == "mailcap"
+        call s:MapDelimiters('#','')
     elseif a:filetype == "make"
         call s:MapDelimiters('#','')
     elseif a:filetype == "map"