diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index da8dd55..0052e13 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -860,6 +860,9 @@ to get illegal syntax when uncommenting them.
 ==============================================================================
 8. Changelog                                                *NERDComChangelog*
 
+2.1.15
+    - added support for pamconf, thanks to Martin Kustermann
+
 2.1.14
     - added support for gitconfig, tar, nerdtree
     - added support for dtrace, thanks to nicothakis for the post
@@ -1248,3 +1251,4 @@ Greg Jandl                          pyrex/cython
 Christophe Benz                     services, gitcommit
 A Pontus                            vimperator
 Stromnov                            slice
+Martin Kustermann                   pamconf
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 2d47f5b..b33fc85 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -564,6 +564,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('', '')
     elseif a:filetype == "ox" 
         call s:MapDelimiters('//', '')
+    elseif a:filetype == "pamconf"
+        call s:MapDelimiters('#', '')
     elseif a:filetype == "pascal" 
         call s:MapDelimitersWithAlternative('{','}', '(*', '*)')
     elseif a:filetype == "passwd"