diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 1c9364d..f73e4d9 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -859,6 +859,8 @@ if your face looked like a toaster and a t-rex put together? :(
 ==============================================================================
 7. Changelog                                                *NERDComChangelog*
 
+2.x.x
+    - add support for potwiki. Thanks to Bernhard Grotz for the email.
 2.1.18
     - add support for llvm. Thanks to nicothakis.
     - add support for xquery. Thanks to Phillip Kovalev.
@@ -1284,6 +1286,7 @@ Krzysztof A. Adamski                group
 Pascal Brueckner                    mailcap
 Jerónimo Carballo                   stata
 Phillip Kovalev                     xquery
+Bernhard Grotz                      potwiki
 
 ==============================================================================
 8. License                                                    *NERDComLicense*
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 1d0f177..875a647 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -619,6 +619,8 @@ function s:SetUpForNewFiletype(filetype, forceReset)
         call s:MapDelimiters('#', '')
     elseif a:filetype == "postscr"
         call s:MapDelimiters('%', '')
+    elseif a:filetype == "potwiki"
+        call s:MapDelimiters('', '')
     elseif a:filetype == "pov"
         call s:MapDelimitersWithAlternative('//','', '/*','*/')
     elseif a:filetype == "povini"